Re: [PATCH] When building with systemd based image, udev-hwdb postinstall script will fail because of not passing correct CPU option. So fix it by passing correct QEMU_OPTIONS.

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3808 bytes --]

On Thu, Dec 04, 2014 at 07:49:19PM +0000, Richard Purdie wrote:
> I have a suspicion the whole QEMU_OPTIONS thing got totally broken by Martin's commit:
> 
> http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=7efad8a1b56df6ee07c12ad360c0493d7b1d6d23
> 
> since the things being appended are not overrides, they're PACKAGE_ARCH
> values. My change below may give us a way out of the current set of
> problems.
> 
> From 8a8b35a02244cf04b6fb368bf1cb4c1edda8d7a6 Mon Sep 17 00:00:00 2001
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Date: Thu, 4 Dec 2014 19:41:27 +0000
> Subject: qemu/libc-package: Fix qemu option handling
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
> index c1bc399..eb76ff9 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" % \
> diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
> index b2cf85d..1c5736f 100644
> --- a/meta/classes/qemu.bbclass
> +++ b/meta/classes/qemu.bbclass
> @@ -29,20 +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)
> +    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 + " "\
>              + rootfs_path + binary
>  
> -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"
> +QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or ""}"
> +QEMU_EXTRAOPTIONS_iwmmxt    = " -cpu pxa270-c5"
> +QEMU_EXTRAOPTIONS_armv6     = " -cpu arm1136"
> +QEMU_EXTRAOPTIONS_armv7a    = " -cpu cortex-a8"
> +QEMU_EXTRAOPTIONS_e500v2    = " -cpu e500v2"
> +QEMU_EXTRAOPTIONS_e500mc    = " -cpu e500mc"
> +QEMU_EXTRAOPTIONS_e5500     = " -cpu e5500"
> +QEMU_EXTRAOPTIONS_e5500-64b = " -cpu e5500"
> +QEMU_EXTRAOPTIONS_e6500     = " -cpu e6500"
> +QEMU_EXTRAOPTIONS_e6500-64b = " -cpu e6500"
> +QEMU_EXTRAOPTIONS_ppc7400   = " -cpu 7400"

Thanks for fixing that. Would it make sense to add comment saying that
nobody is expected to use "QEMU_EXTRAOPTIONS" directly and that they
aren't overrides (so that nobody makes the same mistake as I did).

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]