diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-04 19:49:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-05 17:59:42 +0000 |
| commit | 219e793907406eabf632e784e3a11ab9acb77cfb (patch) | |
| tree | c81a77abe03887a88ca5051b9af2d634aaa5f465 /meta/classes/libc-package.bbclass | |
| parent | 4f301c9cd17043f039d82555f973cbbca9acd51f (diff) | |
| download | openembedded-core-219e793907406eabf632e784e3a11ab9acb77cfb.tar.gz openembedded-core-219e793907406eabf632e784e3a11ab9acb77cfb.tar.bz2 openembedded-core-219e793907406eabf632e784e3a11ab9acb77cfb.zip | |
qemu/libc-package: Fix qemu option handling
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/libc-package.bbclass')
| -rw-r--r-- | meta/classes/libc-package.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index c1bc399c18..eb76ff953a 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -298,9 +298,7 @@ python package_do_split_gconvs () { --inputfile=%s/i18n/locales/%s --charmap=%s %s" \ % (treedir, datadir, locale, encoding, name) - qemu_options = d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) - if not qemu_options: - qemu_options = d.getVar('QEMU_OPTIONS', True) + qemu_options = d.getVar('QEMU_OPTIONS', True) cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \ -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \ |