diff options
| author | Matthew McClintock <msm@freescale.com> | 2012-07-06 15:08:00 -0500 |
|---|---|---|
| committer | Scott Garman <scott.a.garman@intel.com> | 2012-07-18 10:18:38 -0700 |
| commit | 24e8399aeccf4b0742acd986bb506ff6f388b4a2 (patch) | |
| tree | 6bf6bb3a0279a92e4bfca62ee8c4df176ceba3f3 /meta | |
| parent | 2a1f7a8be5170cdb85f9faae81d94ac2ca8b6566 (diff) | |
| download | openembedded-core-24e8399aeccf4b0742acd986bb506ff6f388b4a2.tar.gz openembedded-core-24e8399aeccf4b0742acd986bb506ff6f388b4a2.tar.bz2 openembedded-core-24e8399aeccf4b0742acd986bb506ff6f388b4a2.zip | |
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
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/packagedata.py | 8 |
1 files changed, 8 insertions, 0 deletions
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/') |