From 0bc564af07c1bae8112f834a60aea3b72af7de13 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 9 Aug 2013 18:41:05 -0500 Subject: [PATCH] image.bbclass: Move runtime_mapping_rename to avoid conflict w/ multilib [YOCTO #4993] Move the runtime_mapping_rename into a prefunc for the do_rootfs function. Otherwise doing it in the python section could occur BEFORE the multilib classes renaming. If the package 'b' is a kernel module, then lib32-b and b should both point to the same package. The runtime_mapping code will do this automatically. Before if you ran: bitbake lib32- It may do: start PACKAGE_INSTALL (a b c) remap (a b c) MULTILIB naming (lib32-a lib32-b lib32-c) What we want is: start PACKAGE_INSTALL (a b c) MULTILIB naming (lib32-a lib32-b lib32-c) remap (lib32-a b lib32-c) (From OE-Core rev: 836662c9a9c175521dbcd29cdfc0a7c144d8770f) Signed-off-by: Mark Hatle Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index cf02f88de5..4aae3a7819 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -128,12 +128,6 @@ python () { d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features))) - if d.getVar('BB_WORKERCONTEXT', True) is not None: - pn = d.getVar('PN', True) - runtime_mapping_rename("PACKAGE_INSTALL", pn, d) - runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", pn, d) - runtime_mapping_rename("BAD_RECOMMENDATIONS", pn, d) - # Ensure we have the vendor list for complementary package handling ml_vendor_list = "" multilibs = d.getVar('MULTILIBS', True) or "" @@ -271,6 +265,17 @@ read_only_rootfs_hook () { fi } +# We have to delay the runtime_mapping_rename until just before rootfs runs +# otherwise, the multilib renaming could step in and squash any fixups that +# may have occurred. +python rootfs_runtime_mapping() { + pn = d.getVar('PN', True) + runtime_mapping_rename("PACKAGE_INSTALL", pn, d) + runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", pn, d) + runtime_mapping_rename("BAD_RECOMMENDATIONS", pn, d) +} +do_rootfs[prefuncs] += "rootfs_runtime_mapping" + fakeroot do_rootfs () { #set -x # When use the rpm incremental image generation, don't remove the rootfs