diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-12 17:45:27 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-13 23:47:46 +0100 |
| commit | 1a1927f8a04fe0a2b3b853ebdd33ccb807f00b59 (patch) | |
| tree | b56d63ee9b5b435d58f183d6ffd95daef96ef6cc /meta/classes/image.bbclass | |
| parent | 46b00fdfc9d1e3dc180de087bae2682a1baa2954 (diff) | |
| download | openembedded-core-1a1927f8a04fe0a2b3b853ebdd33ccb807f00b59.tar.gz openembedded-core-1a1927f8a04fe0a2b3b853ebdd33ccb807f00b59.tar.bz2 openembedded-core-1a1927f8a04fe0a2b3b853ebdd33ccb807f00b59.zip | |
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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
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 = "" |