[PATCH 0/1] opkg: Add the condition for the content of arch.conf when enable multilib

[PATCH 0/1] opkg: Add the condition for the content of arch.conf when enable multilib

[Xiaofeng Yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

After successfully installed some lib32 multilib packages into the
x86-64 image, we just found that the file content of /var/lib/opkg/status in
rootfs changed after the very 1st boot, many lib32 related packages information
are missing in that file.

The missing arch "x86" in arch.conf cause the above problem. Adding the
condition for the content of arch.conf when enable multilib. If build
multilib image, "ALL_MULTILIB_PACKAGE_ARCHS" will be used instead of
"PACKAGE_ARCHS".

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/multilib
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/multilib

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  opkg: Add the condition for the content of arch.conf when enable
    multilib

 meta/recipes-devtools/opkg/opkg-config-base_1.0.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

[PATCH 1/1] opkg: Add the condition for the content of arch.conf when enable multilib

[Xiaofeng Yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

After successfully installed some lib32 multilib packages into the
x86-64 image, we just found that the file content of /var/lib/opkg/status in
rootfs changed after the very 1st boot, many lib32 related packages information
are missing in that file.

The missing arch "x86" in arch.conf cause the above problem. Adding the
condition for the content of arch.conf when enable multilib. If build
multilib image, "ALL_MULTILIB_PACKAGE_ARCHS" will be used instead of
"PACKAGE_ARCHS".

[YOCTO #1522]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-devtools/opkg/opkg-config-base_1.0.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
index 3a559cb..f37b2db 100644
--- a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
+++ b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
@@ -9,7 +9,12 @@ do_compile() {
 	archconf=${S}/${sysconfdir}/opkg/arch.conf
 
 	rm -f $archconf
-	ipkgarchs="${PACKAGE_ARCHS}"
+	multilibs="${@d.getVar('MULTILIBS',True)}"
+	if [ "X${multilibs}"  == "XNone" ]; then
+		ipkgarchs="${PACKAGE_ARCHS}"
+	else
+		ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}"
+	fi
 	priority=1
 	for arch in $ipkgarchs; do 
 		echo "arch $arch $priority" >> $archconf
-- 
1.7.0.4

Re: [PATCH 0/1] opkg: Add the condition for the content of arch.conf when enable multilib

[Saul Wold]

On 04/09/2012 12:48 AM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> After successfully installed some lib32 multilib packages into the
> x86-64 image, we just found that the file content of /var/lib/opkg/status in
> rootfs changed after the very 1st boot, many lib32 related packages information
> are missing in that file.
>
> The missing arch "x86" in arch.conf cause the above problem. Adding the
> condition for the content of arch.conf when enable multilib. If build
> multilib image, "ALL_MULTILIB_PACKAGE_ARCHS" will be used instead of
> "PACKAGE_ARCHS".
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: xiaofeng/multilib
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/multilib
>
> Thanks,
>      Xiaofeng Yan<xiaofeng.yan@windriver.com>
> ---
>
>
> Xiaofeng Yan (1):
>    opkg: Add the condition for the content of arch.conf when enable
>      multilib
>
>   meta/recipes-devtools/opkg/opkg-config-base_1.0.bb |    7 ++++++-
>   1 files changed, 6 insertions(+), 1 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>


Merged into OE-Core

Thanks
	Sau!