summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2009-05-15 15:24:53 +0400
committerRoman I Khimov <khimov@altell.ru>2009-05-17 09:23:58 +0400
commit6d64144303ee883e6248578a2027eb29b5d8e6e8 (patch)
tree2b859eebfef96f7c3bd23779eaed41b842063800
parent83cb9a11a2b04f954575bf4f2bc35d0d1743c393 (diff)
(e)glibc-package: fix kernel version passed to qemu
Binary locale generation fails with FATAL: kernel too old if (e)glibc is configured for kernels newer than 2.6.16. This comes from kernel version check in sysdeps/unix/sysv/linux/dl-osinfo.h. We configure (e)glibc with "--enable-kernel=${OLDEST_KERNEL}", so to pass this check we need kernel version reported from QEMU to (e)glibc be $OLDEST_KERNEL or higher. Fix qemu "-r" parameter to match OLDEST_KERNEL. Acked-by: Tom Rini <trini@embeddedalley.com>
-rw-r--r--recipes/eglibc/eglibc-package.bbclass6
-rw-r--r--recipes/glibc/glibc-package.bbclass6
2 files changed, 10 insertions, 2 deletions
diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass
index 7fcb558399..01f698adaf 100644
--- a/recipes/eglibc/eglibc-package.bbclass
+++ b/recipes/eglibc/eglibc-package.bbclass
@@ -287,7 +287,11 @@ python package_do_split_gconvs () {
def output_locale_binary(name, locale, encoding):
target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
- qemu = "qemu-%s -r 2.6.16" % target_arch
+ kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1)
+ if kernel_ver is None:
+ qemu = "qemu-%s -s 1048576" % target_arch
+ else:
+ qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver)
pkgname = 'locale-base-' + legitimize_package_name(name)
m = re.match("(.*)\.(.*)", name)
if m:
diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass
index 89fbd1ca72..8db8c5cb6f 100644
--- a/recipes/glibc/glibc-package.bbclass
+++ b/recipes/glibc/glibc-package.bbclass
@@ -252,7 +252,11 @@ python package_do_split_gconvs () {
if target_arch in ("i486", "i586", "i686"):
target_arch = "i386"
- qemu = "qemu-%s -s 1048576 -r 2.6.16" % target_arch
+ kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1)
+ if kernel_ver is None:
+ qemu = "qemu-%s -s 1048576" % target_arch
+ else:
+ qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver)
pkgname = 'locale-base-' + legitimize_package_name(name)
m = re.match("(.*)\.(.*)", name)
if m: