From 093dec12e6b3ade7d8a88782d6b8ec02d935d58c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 12 Apr 2013 17:45:27 +0100 Subject: package/image.bbclass: Fix multilib rprovides allarch multilib recipes are meant to provide a list of different multilib variants. Unfortunately since the pkgdata also has mappings for these, they get mapped back to the original package name which means the effect is undone at package creation time when the remapping code is called. This patch adds in a conditional to break that chain meaning the packages get the correct RPROVIDES and image builds work correctly with opkg. [YOCTO #3453] (From OE-Core rev: 1a1927f8a04fe0a2b3b853ebdd33ccb807f00b59) Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/classes/populate_sdk_base.bbclass') diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 6280705236..49e446986f 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -30,7 +30,8 @@ EXCLUDE_FROM_WORLD = "1" SDK_PACKAGING_FUNC ?= "create_shar" fakeroot python do_populate_sdk() { - runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", d) + pn = d.getVar('PN', True) + runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", pn, d) bb.build.exec_func("populate_sdk_image", d) -- cgit v1.2.3-54-g00ecf