Patchwork [v2] packagedata.py: Fix get_subpkgedata_fn for multilib

login
register
mail settings
Submitter Matthew McClintock
Date March 9, 2012, 6:20 a.m.
Message ID <1331274040-22494-1-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/22941/
State New
Headers show

Comments

Matthew McClintock - March 9, 2012, 6:20 a.m.
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/lib/oe/packagedata.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
McClintock Matthew-B29882 - March 9, 2012, 7:13 a.m.
Ugh this is supposed to be v3.

-M

On Fri, Mar 9, 2012 at 12:20 AM, Matthew McClintock <msm@freescale.com> wrote:
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  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 a7a40f0..5759fe6 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 = bb.data.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.6.1
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index a7a40f0..5759fe6 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 = bb.data.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/')