From 547cb7047317cfa3b35721de609d1789b7cb6355 Mon Sep 17 00:00:00 2001 From: Xiaofeng Yan Date: Mon, 9 Apr 2012 15:16:32 +0800 Subject: opkg: Add the condition for the content of arch.conf when enable multilib 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] (From OE-Core rev: 700fc9a5d25ebb1f85cb9db11e41ba502744fe7e) Signed-off-by: Xiaofeng Yan Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/opkg') 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 3a559cb57d..f37b2db27d 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 -- cgit v1.2.3-54-g00ecf