summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-07-06 20:08:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-21 10:16:39 (GMT)
commit738f163797f32134d278c439073bd5d9a88f1703 (patch)
treec4810cb9557144055d1c4563780ec514b2c2f4e3 /meta/lib
parent1ddd5378ec7d6d4116174181c2b3d6036b6eb7d7 (diff)
downloadpoky-738f163797f32134d278c439073bd5d9a88f1703.tar.gz
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: 24e8399aeccf4b0742acd986bb506ff6f388b4a2) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/packagedata.py8
1 files changed, 8 insertions, 0 deletions
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):
27 27
28def get_subpkgedata_fn(pkg, d): 28def get_subpkgedata_fn(pkg, d):
29 archs = d.expand("${PACKAGE_ARCHS}").split(" ") 29 archs = d.expand("${PACKAGE_ARCHS}").split(" ")
30 mlarchs = d.getVar("MULTILIB_PACKAGE_ARCHS", d) or None
31
32 if mlarchs:
33 for mlarch in mlarchs.split(" "):
34 if "_" in mlarch:
35 prefix, split, new_arch = mlarch.partition("_")
36 archs.append(new_arch)
37
30 archs.reverse() 38 archs.reverse()
31 pkgdata = d.expand('${TMPDIR}/pkgdata/') 39 pkgdata = d.expand('${TMPDIR}/pkgdata/')
32 targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/') 40 targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')