* [PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib
@ 2012-03-08 21:01 Matthew McClintock
2012-03-08 22:23 ` [PATCH v2] " Matthew McClintock
0 siblings, 1 reply; 6+ messages in thread
From: Matthew McClintock @ 2012-03-08 21:01 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2] packagedata.py: Fix get_subpkgedata_fn for multilib
2012-03-08 21:01 [PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib Matthew McClintock
@ 2012-03-08 22:23 ` Matthew McClintock
2012-03-09 6:20 ` Matthew McClintock
0 siblings, 1 reply; 6+ messages in thread
From: Matthew McClintock @ 2012-03-08 22:23 UTC (permalink / raw)
To: openembedded-core
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..daee779 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, 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2] packagedata.py: Fix get_subpkgedata_fn for multilib
2012-03-08 22:23 ` [PATCH v2] " Matthew McClintock
@ 2012-03-09 6:20 ` Matthew McClintock
2012-03-09 7:13 ` McClintock Matthew-B29882
0 siblings, 1 reply; 6+ messages in thread
From: Matthew McClintock @ 2012-03-09 6:20 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] packagedata.py: Fix get_subpkgedata_fn for multilib
2012-03-09 6:20 ` Matthew McClintock
@ 2012-03-09 7:13 ` McClintock Matthew-B29882
0 siblings, 0 replies; 6+ messages in thread
From: McClintock Matthew-B29882 @ 2012-03-09 7:13 UTC (permalink / raw)
To: openembedded-core@openembedded.org
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib
@ 2012-07-06 20:08 Matthew McClintock
2012-07-09 16:23 ` Saul Wold
0 siblings, 1 reply; 6+ messages in thread
From: Matthew McClintock @ 2012-07-06 20:08 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib
2012-07-06 20:08 [PATCH] " Matthew McClintock
@ 2012-07-09 16:23 ` Saul Wold
0 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-07-09 16:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Matthew McClintock
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!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-07-09 16:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-08 21:01 [PATCH] packagedata.py: Fix get_subpkgedata_fn for multilib Matthew McClintock
2012-03-08 22:23 ` [PATCH v2] " Matthew McClintock
2012-03-09 6:20 ` Matthew McClintock
2012-03-09 7:13 ` McClintock Matthew-B29882
-- strict thread matches above, loose matches on Subject: below --
2012-07-06 20:08 [PATCH] " Matthew McClintock
2012-07-09 16:23 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox