mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

qemu/libc-package: Fix qemu option handling

Browse Source 
The 'overrides' here are PACKAGE_ARCH based and hence not overrides
as such and the _append wasn't working in many cases. This adjusts the
code to use PACKAGE_ARCH as the accessor and ensures the variables
work as expected. This fixes various segfaults and ensures postinsts
run at build time rather than on the target system.

The bug was introduced in http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=7efad8a1b56df6ee07c12ad360c0493d7b1d6d23.

(From OE-Core rev: 219e793907406eabf632e784e3a11ab9acb77cfb)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2014-12-04 19:49:19 +00:00
parent da53141db3
commit b813bdebb3
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/libc-package.bbclass
+1 -3
View File
@@ -298,9 +298,7 @@ python package_do_split_gconvs () {
--inputfile=%s/i18n/locales/%s --charmap=%s %s" \ --inputfile=%s/i18n/locales/%s --charmap=%s %s" \
% (treedir, datadir, locale, encoding, name) % (treedir, datadir, locale, encoding, name)
qemu_options = d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) qemu_options = d.getVar('QEMU_OPTIONS', True)
if not qemu_options:
qemu_options = d.getVar('QEMU_OPTIONS', True)
cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \ cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \
-E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \ -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \
meta/classes/qemu.bbclass
+16 -13
View File
@@ -29,20 +29,23 @@ def qemu_run_binary(data, rootfs_path, binary):
libdir = rootfs_path + data.getVar("libdir", False) libdir = rootfs_path + data.getVar("libdir", False)
base_libdir = rootfs_path + data.getVar("base_libdir", False) base_libdir = rootfs_path + data.getVar("base_libdir", False)
oldest_kernel = data.getVar("OLDEST_KERNEL", True) qemu_options = data.getVar("QEMU_OPTIONS", True)
return "PSEUDO_UNLOAD=1 " + qemu_binary + " -r " + oldest_kernel + " -L " + rootfs_path\ return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\
+ " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\ + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\
+ rootfs_path + binary + rootfs_path + binary
QEMU_OPTIONS = "-r ${OLDEST_KERNEL}" # QEMU_EXTRAOPTIONS is not meant to be directly used, the extensions are
QEMU_OPTIONS_append_iwmmxt = " -cpu pxa270-c5" # PACKAGE_ARCH, not overrides and hence have to do this dance. Simply being arch
QEMU_OPTIONS_append_armv6 = " -cpu arm1136" # specific isn't good enough.
QEMU_OPTIONS_append_armv7a = " -cpu cortex-a8" QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or ""}"
QEMU_OPTIONS_append_e500v2 = " -cpu e500v2" QEMU_EXTRAOPTIONS_iwmmxt = " -cpu pxa270-c5"
QEMU_OPTIONS_append_e500mc = " -cpu e500mc" QEMU_EXTRAOPTIONS_armv6 = " -cpu arm1136"
QEMU_OPTIONS_append_e5500 = " -cpu e5500" QEMU_EXTRAOPTIONS_armv7a = " -cpu cortex-a8"
QEMU_OPTIONS_append_e5500-64b = " -cpu e5500" QEMU_EXTRAOPTIONS_e500v2 = " -cpu e500v2"
QEMU_OPTIONS_append_e6500 = " -cpu e6500" QEMU_EXTRAOPTIONS_e500mc = " -cpu e500mc"
QEMU_OPTIONS_append_e6500-64b = " -cpu e6500" QEMU_EXTRAOPTIONS_e5500 = " -cpu e5500"
QEMU_OPTIONS_append_ppc7400 = " -cpu 7400" QEMU_EXTRAOPTIONS_e5500-64b = " -cpu e5500"
QEMU_EXTRAOPTIONS_e6500 = " -cpu e6500"
QEMU_EXTRAOPTIONS_e6500-64b = " -cpu e6500"
QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400"
meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
+1 -1
View File
@@ -9,7 +9,7 @@ do_install () {
echo "#!/bin/sh" > ${D}${bindir_crossscripts}/qemuwrapper echo "#!/bin/sh" > ${D}${bindir_crossscripts}/qemuwrapper
qemu_binary=${@qemu_target_binary(d)} qemu_binary=${@qemu_target_binary(d)}
qemu_options='${@d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or d.getVar('QEMU_OPTIONS', True) or ""}' qemu_options='${QEMU_OPTIONS}'
echo "$qemu_binary $qemu_options \"\$@\"" >> ${D}${bindir_crossscripts}/qemuwrapper echo "$qemu_binary $qemu_options \"\$@\"" >> ${D}${bindir_crossscripts}/qemuwrapper
fallback_qemu_bin= fallback_qemu_bin=
case $qemu_binary in case $qemu_binary in