[oe-commits] Richard Purdie : opkg-config-base/poky-feed-config-opkg: Always use ALL_MULTILIB_PACKAGE_ARCHS to build arch list
git at git.openembedded.org
git at git.openembedded.org
Mon Apr 16 11:57:56 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: bc85abc5013d0c831cc3c3823df45536c293aaba
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bc85abc5013d0c831cc3c3823df45536c293aaba
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Mon Apr 16 11:31:45 2012 +0000
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../feed-config/poky-feed-config-opkg_1.0.bb | 4 ++--
meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb b/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
index fc223c9..14f1d41 100644
--- a/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
+++ b/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Poky example feed configuration"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r1"
+PR = "r2"
PACKAGE_ARCH = "${MACHINE_ARCH}"
INHIBIT_DEFAULT_DEPS = "1"
@@ -14,7 +14,7 @@ do_compile() {
archconf=${S}/${sysconfdir}/opkg/arch.conf
rm -f $archconf
- ipkgarchs="${PACKAGE_ARCHS}"
+ ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}"
priority=1
for arch in $ipkgarchs; do
echo "arch $arch $priority" >> $archconf
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"
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
More information about the Openembedded-commits
mailing list