From 6a605120ca5f9ba45f5844b8d9ad5af0f103abe3 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Fri, 6 Jul 2012 15:08:00 -0500 Subject: packagedata.py: Fix get_subpkgedata_fn for multilib 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 (From OE-Core rev: 4e65ddda5d351bd9f2172e77e656903f61a52f34) 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 a7a40f0d06..9a28e6b4de 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/') -- cgit v1.2.3-54-g00ecf