summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-09-08 12:58:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 11:33:25 +0100
commit7efad8a1b56df6ee07c12ad360c0493d7b1d6d23 (patch)
treef4f454fc82c3e1ff27f288304b653b60fe2aa203 /meta
parentd8c8ea78f143d629223b5638829a9834bcab89f8 (diff)
downloadpoky-7efad8a1b56df6ee07c12ad360c0493d7b1d6d23.tar.gz
qemu.bbclass: add -r ${OLDEST_KERNEL} parameter
* in some cases (e.g. with external toolchain which doesn't respect our reasonably old version set in OLDEST_KERNEL) it's possible to have libc which requires newer kernel than what we have on builders, qemu supports -r param to use different uname than what's returned by host system. * change qemu_run_binary to pass -r ${OLDEST_KERNEL} and add the same to QEMU_OPTIONS which are used by qemuwrapper-cross * maybe we should eventually convert all qemu_run_binary usages always include qemuwrapper-cross dependency and always call qemu through that (it seems very strange that qemu_target_binary is called from qemuwrapper and for allarch recipes it can return qemu-allarch as qemu binary). qemu_run_binary is used by: meta/classes/gtk-immodules-cache.bbclass: ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \ meta/classes/qemu.bbclass:def qemu_run_binary(data, rootfs_path, binary): meta/recipes-core/systemd/systemd_213.bb: ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \ meta/recipes-graphics/pango/pango.inc: ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ and qemuwrapper directly by: scripts/postinst-intercepts/update_font_cache:PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ scripts/postinst-intercepts/update_pixbuf_cache:PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ (From OE-Core rev: 1f0bff320077f4d9f2ee51096a1438e8cae9dd0d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/qemu.bbclass25
1 files changed, 13 insertions, 12 deletions
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index abee8aaa7c..b2cf85d628 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -29,19 +29,20 @@ def qemu_run_binary(data, rootfs_path, binary):
29 29
30 libdir = rootfs_path + data.getVar("libdir", False) 30 libdir = rootfs_path + data.getVar("libdir", False)
31 base_libdir = rootfs_path + data.getVar("base_libdir", False) 31 base_libdir = rootfs_path + data.getVar("base_libdir", False)
32 oldest_kernel = data.getVar("OLDEST_KERNEL", True)
32 33
33 return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\ 34 return "PSEUDO_UNLOAD=1 " + qemu_binary + " -r " + oldest_kernel + " -L " + rootfs_path\
34 + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\ 35 + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\
35 + rootfs_path + binary 36 + rootfs_path + binary
36 37
37QEMU_OPTIONS = "" 38QEMU_OPTIONS = "-r ${OLDEST_KERNEL}"
38QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5" 39QEMU_OPTIONS_append_iwmmxt = " -cpu pxa270-c5"
39QEMU_OPTIONS_armv6 = "-cpu arm1136" 40QEMU_OPTIONS_append_armv6 = " -cpu arm1136"
40QEMU_OPTIONS_armv7a = "-cpu cortex-a8" 41QEMU_OPTIONS_append_armv7a = " -cpu cortex-a8"
41QEMU_OPTIONS_e500v2 = "-cpu e500v2" 42QEMU_OPTIONS_append_e500v2 = " -cpu e500v2"
42QEMU_OPTIONS_e500mc = "-cpu e500mc" 43QEMU_OPTIONS_append_e500mc = " -cpu e500mc"
43QEMU_OPTIONS_e5500 = "-cpu e5500" 44QEMU_OPTIONS_append_e5500 = " -cpu e5500"
44QEMU_OPTIONS_e5500-64b = "-cpu e5500" 45QEMU_OPTIONS_append_e5500-64b = " -cpu e5500"
45QEMU_OPTIONS_e6500 = "-cpu e6500" 46QEMU_OPTIONS_append_e6500 = " -cpu e6500"
46QEMU_OPTIONS_e6500-64b = "-cpu e6500" 47QEMU_OPTIONS_append_e6500-64b = " -cpu e6500"
47QEMU_OPTIONS_ppc7400 = "-cpu 7400" 48QEMU_OPTIONS_append_ppc7400 = " -cpu 7400"