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-<image> 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 <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c8879e23ab
commit
0bc564af07
|
@ -128,12 +128,6 @@ python () {
|
||||||
|
|
||||||
d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features)))
|
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
|
# Ensure we have the vendor list for complementary package handling
|
||||||
ml_vendor_list = ""
|
ml_vendor_list = ""
|
||||||
multilibs = d.getVar('MULTILIBS', True) or ""
|
multilibs = d.getVar('MULTILIBS', True) or ""
|
||||||
|
@ -271,6 +265,17 @@ read_only_rootfs_hook () {
|
||||||
fi
|
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 () {
|
fakeroot do_rootfs () {
|
||||||
#set -x
|
#set -x
|
||||||
# When use the rpm incremental image generation, don't remove the rootfs
|
# When use the rpm incremental image generation, don't remove the rootfs
|
||||||
|
|
Loading…
Reference in New Issue