summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 11:31:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 11:52:10 (GMT)
commitf139832667058ee9dc0f4f03733d697bb0179981 (patch)
treecc31ad9b810f23d97990a7e1e5fa60cb053d72cf /meta/recipes-devtools
parentd431ef2a30c038573c9ee7ec7ab8009c6e2ab113 (diff)
downloadpoky-f139832667058ee9dc0f4f03733d697bb0179981.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg/opkg-config-base_1.0.bb8
1 files changed, 2 insertions, 6 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 f37b2db..f40e981 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"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4PACKAGE_ARCH = "${MACHINE_ARCH}" 4PACKAGE_ARCH = "${MACHINE_ARCH}"
5PR = "r1"
5 6
6do_compile() { 7do_compile() {
7 mkdir -p ${S}/${sysconfdir}/opkg/ 8 mkdir -p ${S}/${sysconfdir}/opkg/
@@ -9,12 +10,7 @@ do_compile() {
9 archconf=${S}/${sysconfdir}/opkg/arch.conf 10 archconf=${S}/${sysconfdir}/opkg/arch.conf
10 11
11 rm -f $archconf 12 rm -f $archconf
12 multilibs="${@d.getVar('MULTILIBS',True)}" 13 ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}"
13 if [ "X${multilibs}" == "XNone" ]; then
14 ipkgarchs="${PACKAGE_ARCHS}"
15 else
16 ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}"
17 fi
18 priority=1 14 priority=1
19 for arch in $ipkgarchs; do 15 for arch in $ipkgarchs; do
20 echo "arch $arch $priority" >> $archconf 16 echo "arch $arch $priority" >> $archconf