aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2014-03-04 04:28:43 +0200
committerRiku Voipio <riku.voipio@linaro.org>2014-03-04 04:55:57 +0200
commit71b6a25e5edf7e6765a3c22f947077e003edab48 (patch)
treea6ac6cdc559137b65f5d05161e6be26214c13f20
parent8a84146707a80248ce637cabd27b5e04bdac8b7b (diff)
downloadqemu-uname-cleanup.tar.gz
linux-user: remove configure option for setting uname releaseuname-cleanup
--enable-uname-release is rather heavyweight hammer, as it allows providing values less that UNAME_MINIMUM_RELEASE. Also, it affects all built linux-user targets, which in most cases not what you want. Now that we have UNAME_MINIMUM_RELEASE for all linux-user platforms, we can drop --enable-uname-release and the related CONFIG_UNAME_RELEASE define. Users can still override the variable with QEMU_UNAME=2.6.32 or -r command line option. If distributors need to update a minimum version for a specific target, it should be done by updating UNAME_MINIMUM_RELEASE. Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-rwxr-xr-xconfigure8
-rw-r--r--linux-user/main.c2
-rw-r--r--linux-user/uname.c2
3 files changed, 1 insertions, 11 deletions
diff --git a/configure b/configure
index 8ad03ea17d..52804b815a 100755
--- a/configure
+++ b/configure
@@ -267,7 +267,6 @@ softmmu="yes"
linux_user="no"
bsd_user="no"
guest_base="yes"
-uname_release=""
aix="no"
blobs="yes"
pkgversion=""
@@ -921,8 +920,6 @@ for opt do
;;
--disable-pie) pie="no"
;;
- --enable-uname-release=*) uname_release="$optarg"
- ;;
--enable-werror) werror="yes"
;;
--disable-werror) werror="no"
@@ -1253,7 +1250,6 @@ Advanced options (experts only):
--fmod-lib path to FMOD library
--fmod-inc path to FMOD includes
--oss-lib path to OSS library
- --enable-uname-release=R Return R for uname -r in usermode emulation
--cpu=CPU Build for host CPU [$cpu]
--disable-uuid disable uuid support
--enable-uuid enable uuid support
@@ -3993,8 +3989,6 @@ echo "xen support $xen"
echo "brlapi support $brlapi"
echo "bluez support $bluez"
echo "Documentation $docs"
-[ ! -z "$uname_release" ] && \
-echo "uname -r $uname_release"
echo "GUEST_BASE $guest_base"
echo "PIE $pie"
echo "vde support $vde"
@@ -4390,8 +4384,6 @@ if [ "$bsd" = "yes" ] ; then
echo "CONFIG_BSD=y" >> $config_host_mak
fi
-echo "CONFIG_UNAME_RELEASE=\"$uname_release\"" >> $config_host_mak
-
if test "$zero_malloc" = "yes" ; then
echo "CONFIG_ZERO_MALLOC=y" >> $config_host_mak
fi
diff --git a/linux-user/main.c b/linux-user/main.c
index c19e7fb704..0514d7d9d3 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -69,7 +69,7 @@ unsigned long reserved_va;
static void usage(void);
static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX;
-const char *qemu_uname_release = CONFIG_UNAME_RELEASE;
+const char *qemu_uname_release;
/* XXX: on x86 MAP_GROWSDOWN only works if ESP <= address + 32, so
we allocate a bigger stack. Need a better solution, for example
diff --git a/linux-user/uname.c b/linux-user/uname.c
index fa5013e76c..f5d4c66f59 100644
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -155,7 +155,6 @@ void init_qemu_uname_release(void)
* a specific fake version number, we might want to fake a minimum
* target kernel version.
*/
-#ifdef UNAME_MINIMUM_RELEASE
struct new_utsname buf;
if (qemu_uname_release && *qemu_uname_release) {
@@ -169,5 +168,4 @@ void init_qemu_uname_release(void)
if (relstr_to_int(buf.release) < relstr_to_int(UNAME_MINIMUM_RELEASE)) {
qemu_uname_release = UNAME_MINIMUM_RELEASE;
}
-#endif
}