sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Richard Purdie 2012-04-16 11:31:45 +00:00
parent d431ef2a30
commit f139832667
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
View File

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

8
meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
View File

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