mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

qemu.bbclass: add -r ${OLDEST_KERNEL} parameter

Browse Source 
* 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>
This commit is contained in:
Martin Jansa
2014-09-08 12:58:44 +01:00
committed by Richard Purdie
parent d8c8ea78f1
commit 7efad8a1b5
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
meta/classes/qemu.bbclass
View File

@@ -29,19 +29,20 @@ def qemu_run_binary(data, rootfs_path, binary):
libdir = rootfs_path + data.getVar("libdir", False)
base_libdir = rootfs_path + data.getVar("base_libdir", False)
oldest_kernel = data.getVar("OLDEST_KERNEL", True)
return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\
return "PSEUDO_UNLOAD=1 " + qemu_binary + " -r " + oldest_kernel + " -L " + rootfs_path\
+ " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\
+ rootfs_path + binary
QEMU_OPTIONS = ""
QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5"
QEMU_OPTIONS_armv6 = "-cpu arm1136"
QEMU_OPTIONS_armv7a = "-cpu cortex-a8"
QEMU_OPTIONS_e500v2 = "-cpu e500v2"
QEMU_OPTIONS_e500mc = "-cpu e500mc"
QEMU_OPTIONS_e5500 = "-cpu e5500"
QEMU_OPTIONS_e5500-64b = "-cpu e5500"
QEMU_OPTIONS_e6500 = "-cpu e6500"
QEMU_OPTIONS_e6500-64b = "-cpu e6500"
QEMU_OPTIONS_ppc7400 = "-cpu 7400"
QEMU_OPTIONS = "-r ${OLDEST_KERNEL}"
QEMU_OPTIONS_append_iwmmxt = " -cpu pxa270-c5"
QEMU_OPTIONS_append_armv6 = " -cpu arm1136"
QEMU_OPTIONS_append_armv7a = " -cpu cortex-a8"
QEMU_OPTIONS_append_e500v2 = " -cpu e500v2"
QEMU_OPTIONS_append_e500mc = " -cpu e500mc"
QEMU_OPTIONS_append_e5500 = " -cpu e5500"
QEMU_OPTIONS_append_e5500-64b = " -cpu e5500"
QEMU_OPTIONS_append_e6500 = " -cpu e6500"
QEMU_OPTIONS_append_e6500-64b = " -cpu e6500"
QEMU_OPTIONS_append_ppc7400 = " -cpu 7400"