diff options
| -rw-r--r-- | meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb | 4 | ||||
| -rw-r--r-- | 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 fc223c993..14f1d4194 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 f37b2db27..f40e98112 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 |