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>
This commit is contained in:
Xiaofeng Yan 2012-04-09 15:16:32 +08:00 committed by Richard Purdie
parent aedff44a9a
commit 547cb70473
1 changed files with 6 additions and 1 deletions

View File

@ -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