diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image.bbclass | 17 |
1 files 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 |