|
 |
5544c1 |
From 20936a5a29113b32aeb319ca5ebe2a754cd3e014 Mon Sep 17 00:00:00 2001
|
|
|
5544c1 |
From: Stefan Weil <sw@weilnetz.de>
|
|
|
5544c1 |
Date: Fri, 14 Sep 2012 19:02:30 +0200
|
|
|
5544c1 |
Subject: [PATCH] configure: Allow builds without any system or user emulation
|
|
|
5544c1 |
|
|
|
5544c1 |
The old code aborted configure when no emulation target was selected.
|
|
|
5544c1 |
Even after removing the 'exit 1', it tried to read from STDIN
|
|
|
5544c1 |
when QEMU was configured with
|
|
|
5544c1 |
|
|
|
5544c1 |
configure' '--disable-user' '--disable-system'
|
|
|
5544c1 |
|
|
|
5544c1 |
This is fixed here.
|
|
|
5544c1 |
|
|
|
5544c1 |
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
|
|
5544c1 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
5544c1 |
(cherry picked from commit 8bdd3d499fe0ddffa9901c56ab3bc8911d5b8be0)
|
|
|
5544c1 |
|
|
|
5544c1 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
5544c1 |
---
|
|
|
5544c1 |
Makefile | 5 +++++
|
|
|
5544c1 |
configure | 4 ----
|
|
|
5544c1 |
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
5544c1 |
|
|
|
5544c1 |
diff --git a/Makefile b/Makefile
|
|
|
5544c1 |
index 1cd5bc8..dd11e3c 100644
|
|
|
5544c1 |
--- a/Makefile
|
|
|
5544c1 |
+++ b/Makefile
|
|
|
5544c1 |
@@ -52,8 +52,13 @@ SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) BUILD_DIR=$(BUILD_DIR)
|
|
|
5544c1 |
SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
|
|
|
5544c1 |
SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS))
|
|
|
5544c1 |
|
|
|
5544c1 |
+ifeq ($(SUBDIR_DEVICES_MAK),)
|
|
|
5544c1 |
+config-all-devices.mak:
|
|
|
5544c1 |
+ $(call quiet-command,echo '# no devices' > $@," GEN $@")
|
|
|
5544c1 |
+else
|
|
|
5544c1 |
config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
|
|
|
5544c1 |
$(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@," GEN $@")
|
|
|
5544c1 |
+endif
|
|
|
5544c1 |
|
|
|
5544c1 |
-include $(SUBDIR_DEVICES_MAK_DEP)
|
|
|
5544c1 |
|
|
|
5544c1 |
diff --git a/configure b/configure
|
|
|
5544c1 |
index a1f256c..f528146 100755
|
|
|
5544c1 |
--- a/configure
|
|
|
5544c1 |
+++ b/configure
|
|
|
5544c1 |
@@ -1296,10 +1296,6 @@ if test -z "$target_list" ; then
|
|
|
5544c1 |
else
|
|
|
5544c1 |
target_list=`echo "$target_list" | sed -e 's/,/ /g'`
|
|
|
5544c1 |
fi
|
|
|
5544c1 |
-if test -z "$target_list" ; then
|
|
|
5544c1 |
- echo "No targets enabled"
|
|
|
5544c1 |
- exit 1
|
|
|
5544c1 |
-fi
|
|
|
5544c1 |
# see if system emulation was really requested
|
|
|
5544c1 |
case " $target_list " in
|
|
|
5544c1 |
*"-softmmu "*) softmmu=yes
|
|
|
5544c1 |
--
|
|
|
5544c1 |
1.7.12.1
|
|
|
5544c1 |
|