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 fc223c993b..14f1d4194a 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 @@ | |||
1 | DESCRIPTION = "Poky example feed configuration" | 1 | DESCRIPTION = "Poky example feed configuration" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | PR = "r1" | 4 | PR = "r2" |
5 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 5 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
6 | INHIBIT_DEFAULT_DEPS = "1" | 6 | INHIBIT_DEFAULT_DEPS = "1" |
7 | 7 | ||
@@ -14,7 +14,7 @@ do_compile() { | |||
14 | archconf=${S}/${sysconfdir}/opkg/arch.conf | 14 | archconf=${S}/${sysconfdir}/opkg/arch.conf |
15 | 15 | ||
16 | rm -f $archconf | 16 | rm -f $archconf |
17 | ipkgarchs="${PACKAGE_ARCHS}" | 17 | ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}" |
18 | priority=1 | 18 | priority=1 |
19 | for arch in $ipkgarchs; do | 19 | for arch in $ipkgarchs; do |
20 | echo "arch $arch $priority" >> $archconf | 20 | 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 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" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 4 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
5 | PR = "r1" | ||
5 | 6 | ||
6 | do_compile() { | 7 | do_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 |