opkg: Add the condition for the content of arch.conf when enable multilib

From: Xiaofeng Yan <[email protected]>

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 <[email protected]>
---

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(-)

From: Xiaofeng Yan <[email protected]>

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]

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

index 3a559cb..f37b2db 100644
@@ -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

Merged into OE-Core

Thanks
Sau!