[PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib

[PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib

[Matthew McClintock]

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/lib/oe/packagedata.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index a7a40f0..124a49d 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -27,6 +27,13 @@ def read_pkgdatafile(fn):
 
 def get_subpkgedata_fn(pkg, d):
     archs = d.expand("${PACKAGE_ARCHS}").split(" ")
+    mlarchs = d.expand("${MULTILIB_PACKAGE_ARCHS}", d).split(" ")
+
+    for mlarch in mlarchs:
+        if "_" in mlarch:
+            prefix, new_arch = mlarch.split("_")
+            archs.append(new_arch)
+
     archs.reverse()
     pkgdata = d.expand('${TMPDIR}/pkgdata/')
     targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
-- 
1.7.6.1

[PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib

[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 <msm@freescale.com>
---
 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/')
-- 
1.7.10

Re: [PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib

[Saul Wold]

On 07/06/2012 01:08 PM, Matthew McClintock wrote:
> 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>
> ---
>   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/')
>

Merged into OE-Core

Thanks
	Sau!