]> code.ossystems Code Review - openembedded-core.git/commitdiff
multilib: add override for image recipe
authorChangqing Li <changqing.li@windriver.com>
Wed, 12 Jun 2019 07:04:05 +0000 (15:04 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 12 Jun 2019 20:08:13 +0000 (21:08 +0100)
MACHINE set to qemux86-64
for lib32-core-image-sato, during do_rootfs, it will run
install_complementary, which will get localedir by
d.getVar("libdir"), without override, libdir will still be
lib64. add override to fix it.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/multilib.bbclass

index 2b761f35515c482ebc318644e97d8f973e30971e..7750221f7d4888ed5e2431f9acad6fb146fd2036 100644 (file)
@@ -33,6 +33,8 @@ python multilib_virtclass_handler () {
         e.data.setVar("MLPREFIX", variant + "-")
         e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
         e.data.setVar('SDKTARGETSYSROOT', e.data.getVar('SDKTARGETSYSROOT'))
+        override = ":virtclass-multilib-" + variant
+        e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
         target_vendor = e.data.getVar("TARGET_VENDOR_" + "virtclass-multilib-" + variant, False)
         if target_vendor:
             e.data.setVar("TARGET_VENDOR", target_vendor)