From f139832667058ee9dc0f4f03733d697bb0179981 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Apr 2012 11:31:45 +0000 Subject: opkg-config-base/poky-feed-config-opkg: Always use ALL_MULTILIB_PACKAGE_ARCHS to build arch list We need consistent configuration files for opkg so we might as well always use the full list. This is equal to PACKAGE_ARCHS in the non-multilib case. This fixes various multilib failures with ipk multilibs. (From OE-Core rev: bc85abc5013d0c831cc3c3823df45536c293aaba) Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools') 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 f37b2db27d..f40e981126 100644 --- a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb +++ b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Base configuration files for opkg" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PACKAGE_ARCH = "${MACHINE_ARCH}" +PR = "r1" do_compile() { mkdir -p ${S}/${sysconfdir}/opkg/ @@ -9,12 +10,7 @@ do_compile() { archconf=${S}/${sysconfdir}/opkg/arch.conf rm -f $archconf - multilibs="${@d.getVar('MULTILIBS',True)}" - if [ "X${multilibs}" == "XNone" ]; then - ipkgarchs="${PACKAGE_ARCHS}" - else - ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}" - fi + ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}" priority=1 for arch in $ipkgarchs; do echo "arch $arch $priority" >> $archconf -- cgit v1.2.3-54-g00ecf