From a04c1367199faf2075d3662000c99e94c77439f3 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/image.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3cde0b8cba..4e9c29cb8b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -116,8 +116,9 @@ python () { d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features))) if d.getVar('BB_WORKERCONTEXT', True) is not None: - runtime_mapping_rename("PACKAGE_INSTALL", d) - runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d) + pn = d.getVar('PN', True) + runtime_mapping_rename("PACKAGE_INSTALL", pn, d) + runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", pn, d) # Ensure we have the vendor list for complementary package handling ml_vendor_list = "" -- cgit v1.2.3-54-g00ecf