image.bbclass: Move runtime_mapping_rename to avoid conflict w/ multilib
authorMark Hatle <mark.hatle@windriver.com>
Fri, 9 Aug 2013 23:41:05 +0000 (18:41 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 13 Aug 2013 22:06:01 +0000 (23:06 +0100)
commite24604cd91263e37543f448d22d0b0f741f27652
tree2b7e65da5adbf197c0f2e5d282bcac3ae815f378
parente65fc50fbfe8dc137775a64d61c61daaa65aa335
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>
meta/classes/image.bbclass