From patchwork Mon Aug 13 21:14:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [05/32] packagedata.py: Fix get_subpkgedata_fn for multilib Date: Mon, 13 Aug 2012 21:14:46 -0000 From: Scott Garman X-Patchwork-Id: 34395 Message-Id: <24e8399aeccf4b0742acd986bb506ff6f388b4a2.1344892361.git.scott.a.garman@intel.com> To: openembedded-core@lists.openembedded.org From: Matthew McClintock This happens when tryng to add libgcc-dev to as a multilib package (e.g. IMAGE_INSTALL_append = " lib32-libgcc-dev") | Processing task-core-boot... | Processing fman-ucode... | Processing dosfstools... | Processing lib32-libgcc-dev... | Unable to find package lib32-libgcc-dev (libgcc-dev)! NOTE: package fsl-image-full-1.0-r1.1.3.6: task do_rootfs: Failed RPM (or bitbake?) is looking in the tmp/pkgdata, however some of these file paths are mungned for the multilib scenario: $ find tmp/pkgdata/ | grep libgcc-dev$ tmp/pkgdata/ppce5500-fsl-linux/runtime/lib32-libgcc-dev tmp/pkgdata/ppc64e5500-fsl-linux/runtime/libgcc-dev This patch fixes where we look for these files so they can be found and properly installed for the multilib root file system Signed-off-by: Matthew McClintock Signed-off-by: Richard Purdie --- meta/lib/oe/packagedata.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py index a7a40f0..9a28e6b 100644 --- a/meta/lib/oe/packagedata.py +++ b/meta/lib/oe/packagedata.py @@ -27,6 +27,14 @@ def read_pkgdatafile(fn): def get_subpkgedata_fn(pkg, d): archs = d.expand("${PACKAGE_ARCHS}").split(" ") + mlarchs = d.getVar("MULTILIB_PACKAGE_ARCHS", d) or None + + if mlarchs: + for mlarch in mlarchs.split(" "): + if "_" in mlarch: + prefix, split, new_arch = mlarch.partition("_") + archs.append(new_arch) + archs.reverse() pkgdata = d.expand('${TMPDIR}/pkgdata/') targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')