diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2014-03-04 04:28:43 +0200 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2014-05-02 21:59:36 +0300 |
| commit | e586822a58b6609edb5ea929e8a4aa394d32389f (patch) | |
| tree | a8a5c050e12e18fbdc075be8ee3ea9744732655e /linux-user | |
| parent | 6d30db19caab3cc71a9353cab772b258f0545503 (diff) | |
| download | qemu-e586822a58b6609edb5ea929e8a4aa394d32389f.tar.gz qemu-e586822a58b6609edb5ea929e8a4aa394d32389f.tar.bz2 qemu-e586822a58b6609edb5ea929e8a4aa394d32389f.zip | |
linux-user: remove configure option for setting uname release
--enable-uname-release was a 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 is not what user
wants.
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 can be done by updating UNAME_MINIMUM_RELEASE.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 2 | ||||
| -rw-r--r-- | linux-user/uname.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index 947358a886..c38fecfdd9 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 } |