summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2012-04-09 15:16:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-10 13:32:01 +0100
commit547cb7047317cfa3b35721de609d1789b7cb6355 (patch)
tree28c61c5890b63bf7e2ed5640980a658b9ff3aef1 /meta/recipes-devtools
parentaedff44a9a257ac67bfa6d18fb205ae49c1a7362 (diff)
downloadpoky-547cb7047317cfa3b35721de609d1789b7cb6355.tar.gz
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 <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg/opkg-config-base_1.0.bb7
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 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() {
9 archconf=${S}/${sysconfdir}/opkg/arch.conf 9 archconf=${S}/${sysconfdir}/opkg/arch.conf
10 10
11 rm -f $archconf 11 rm -f $archconf
12 ipkgarchs="${PACKAGE_ARCHS}" 12 multilibs="${@d.getVar('MULTILIBS',True)}"
13 if [ "X${multilibs}" == "XNone" ]; then
14 ipkgarchs="${PACKAGE_ARCHS}"
15 else
16 ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}"
17 fi
13 priority=1 18 priority=1
14 for arch in $ipkgarchs; do 19 for arch in $ipkgarchs; do
15 echo "arch $arch $priority" >> $archconf 20 echo "arch $arch $priority" >> $archconf