Clean up IPKG_ARCHS as it was being used inconsistently, often with duplication....

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 2880411c31b95817d49849777f806f05c46a9394..27295035076e63431307171868d0408526a6451f 100644 (file)
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -37,7 +37,7 @@ real_do_rootfs () {
        fi
        mkdir -p ${T}
        echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
-       ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+       ipkgarchs="${IPKG_ARCHS}"
        priority=1
        for arch in $ipkgarchs; do
                echo "arch $arch $priority" >> ${T}/ipkg.conf

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 3542cfbdeed8fc8175e2be7a4fb2bf020bd48d76..9c1ba1f47c7eef137d581db812297cdfc1de9d6d 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -57,6 +57,7 @@ TARGET_CC_ARCH = ""
 
 PACKAGE_ARCH = "${HOST_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
+IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
 
 ##################################################################
 # Date/time variables.

diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf
index 316720d65538665ac50978e25e5f8680eb9a419c..0e3d36ed2d811d1c4ddf6eb0cb061c61218edc4d 100644 (file)
--- a/conf/distro/openmn.conf
+++ b/conf/distro/openmn.conf
@@ -12,7 +12,7 @@ TARGET_OS = "linux"
 
 INHERIT += "package_ipk"
 INHERIT += "debian"
-IPKG_ARCHS = "armv5te openmn"
+IPKG_EXTRA_ARCHS = "armv5te openmn"
 
 FEED_URIS  = "mnci54##http://www.mn-solutions.de/feed/mnci54/base"
 

diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 599d78789820744ebe4729e49f6911ff1dba244b..6d76e0946ad0d709a71b3cbda62c97f0151b7630 100644 (file)
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -26,7 +26,7 @@ THUMB_INTERWORK = "no"
 # to armeb - this makes this stuff independent of changes in machine/nslu2.conf
 TARGET_ARCH = "armeb"
 PACKAGE_ARCH = "${TARGET_ARCH}"
-# IPKG_ARCHS has the full list of supported architectures (from nslu2.conf)
+# IPKG_EXTRA_ARCHS has the full list of supported architectures (from nslu2.conf)
 
 # match the optimisation settings to that which has traditionally been used
 # in unslung

diff --git a/conf/documentation.conf b/conf/documentation.conf
index b072ac8c67b19e3b0a464093b23b2238a1026f58..c07c8fa68be712c41132e9d63a52c4779e6cf841 100644 (file)
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -38,6 +38,8 @@ PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If y
 machine dependant configuration options in your bitbake file add a \
 PACKAGE_ARCH  = "${MACHINE_ARCH}" to the file.'
 
+IPKG_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority'
+IPKG_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures'
 
 DATE[doc] = "The date the build was started Ymd"
 TIME[doc] = "The time the build was started HMS"

diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index 3977f50e2b219595c7a79c8524d9821ec04ce986..0b33e3478e1ff0949aa85bbb02af5e3d5999e971 100644 (file)
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -5,7 +5,7 @@
 include conf/machine/include/motorola-ezx.conf
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 

diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf
index dbe74dea45121c5943943e4538762df1b9428409..193048ae5213e8e65c9f959e84758c0c33735c0e 100644 (file)
--- a/conf/machine/amsdelta.conf
+++ b/conf/machine/amsdelta.conf
@@ -5,7 +5,6 @@
 TARGET_ARCH = "arm"
 
 TARGET_FPU = "soft"
-IPKG_ARCHS = "all arm ${MACHINE}"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-amsdelta-2.6"

diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf
index 9c2b94df42b88c5eb2199dfd906ce77ad1ed481b..251dc8a806ee7ac80b39844782891955302f5660 100644 (file)
--- a/conf/machine/blueangel.conf
+++ b/conf/machine/blueangel.conf
@@ -7,7 +7,7 @@ KERNEL ?= "kernel26"
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa blueangel"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6"
 PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6"

diff --git a/conf/machine/colinux.conf b/conf/machine/colinux.conf
index 1af280c2b3dd2b267f017a1c823e9200571ae26b..556944ef8ebd7f120b0aa705e0431b052684d777 100644 (file)
--- a/conf/machine/colinux.conf
+++ b/conf/machine/colinux.conf
@@ -3,6 +3,6 @@
 #@DESCRIPTION: Machine configuration for Cooperative Linux running on an x86 compatible PC
 
 TARGET_ARCH = "i686"
-IPKG_ARCHS = "all i686 i386 x86 ${MACHINE}"
+IPKG_EXTRA_ARCHS = "i386 x86"
 PREFERRED_PROVIDER_virtual/kernel = "linux-colinux"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules"

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 3e95848a3507d0878e3ecf2c4d73a22220a68572..0363f05e6b8305543982c0174d6e887581e73bd8 100644 (file)
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \

diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index 39ef40ae1668b4885afae171ec9999c5988e5c77..6bc632dbdd0581ca1325ca5a1b2b9d2be055cbdd 100644 (file)
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 
 GUI_MACHINE_CLASS = "bigscreen"
-IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"

diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 40387b53a94787f29426f7ccb58c03c2edab4620..103bd13e4bd9669c7cb79fe5f57a8fd6220dc88c 100644 (file)
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -5,7 +5,7 @@
 INHERIT += "linux_modules"
 
 TARGET_ARCH = "powerpc"
-IPKG_ARCHS = "all ppc ${MACHINE}"
+IPKG_EXTRA_ARCHS = "ppc"
 
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"

diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index b1e620882d4f7bcf98903f061cd7d9c301679813..4b044e838dbc06db729852cbc03fadd298460b76 100644 (file)
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -5,7 +5,7 @@
 INHERIT += "linux_modules"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4t ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 

diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 0d3bcedee355b7b8875098612e874fa86daf79be..dd6b0f0b93503d06d3643d39978944a083614177 100644 (file)
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -7,7 +7,7 @@ udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
-IPKG_ARCHS = "i386"
+IPKG_EXTRA_ARCHS = "i386"
 
 include conf/machine/include/tune-c3.conf
 

diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
index e4f56f16e3402fda8c70b7c0f8f592309aa243d3..f9083615a4c63c76dbab56bad85d4069b0995b6e 100644 (file)
--- a/conf/machine/geodegx.conf
+++ b/conf/machine/geodegx.conf
@@ -3,7 +3,7 @@
 # Released under the MIT license (see packages/COPYING)
 
 TARGET_ARCH =  "i486"
-IPKG_ARCHS = "all i486 geodegx"
+IPKG_EXTRA_ARCHS = "geodegx"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"

diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf
index 8da2f5ca3a6de36d364c9bf601c55117a63eecea..75c671a3d4f6518ab5e98f3a4f3f5aa0a9e562ac 100644 (file)
--- a/conf/machine/gumstix.conf
+++ b/conf/machine/gumstix.conf
@@ -3,7 +3,6 @@ TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix"
 OLDEST_KERNEL = "2.6.15"
 MODUTILS = "26"
-IPKG_ARCHS = "arm ${MACHINE}"
 
 include conf/machine/include/tune-xscale.conf
 TARGET_CC_ARCH = "-Os -pipe -Os -march=armv5te -mtune=xscale -Wa,-mcpu=xscale"

diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 7ebcccb293c0a7f6478079f222bfe3c93e904e6b..a023118268967d02d2f6205d14528c62311fd909 100644 (file)
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -6,7 +6,7 @@ KERNEL ?= "kernel26"
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv5te h1910"
+IPKG_EXTRA_ARCHS = "armv5te"
 
 include conf/machine/include/tune-xscale.conf
 

diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index fb4dc8c7108ac776bce4f45b4329a8c9118976b1..b11e447ea0a2cf45105444c5d941db3a612bdc75 100644 (file)
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -2,7 +2,7 @@
 #@NAME: h1940
 #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940
 
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te h1940"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 TARGET_ARCH = arm
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"

diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 40401daeceeef4bdf2628b617153e73834b75f53..fab57cae382a31d6cd36f4ca70ac7d3b0e975ba1 100644 (file)
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -4,7 +4,7 @@
 
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"

diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index b364758428df5d047cc24a8323cafce4d62ea7a4..0261a84d64fe5fbfe4f97bbf0e5861efc9acf880 100644 (file)
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Compaq iPAQ 36xx, Compaq iPAQ 37xx and Compaq iPAQ 38xx devices
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ipaqsa h3600"
+IPKG_EXTRA_ARCHS = "ipaqsa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
 EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"

diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index cab50dbdf6abf55bcdfd36ffe4790e61acc4f9ee..1611ed431a26f37508f403d56eb556bd765f191c 100644 (file)
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -8,7 +8,7 @@ KERNEL ?= "kernel24"
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
 PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"

diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 3f8b7d7115eae4e3d45e93aa90167427af1b9a05..33855e3a6635f62fc478fc874df80d2713598d89 100644 (file)
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 PACKAGE_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4"
+IPKG_EXTRA_ARCHS = "armv4"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1"

diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 2dab2e2e40df9000f07f174a7717220a4cbca5c0..93befb92cec37a96184ac22130612c5ab206721e 100644 (file)
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
 #    because everything built here is no more specific than that.
 MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}"
 
-# IPKG_ARCHS
+# IPKG_EXTRA_ARCHS
 #    The full list of package architectures which should run on the system.
 #    This takes into account both the board level issues and the INPUTS set
 #    by the distro.  The arm list is derived from the architecture settings
@@ -126,12 +126,12 @@ THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t$
 #    NOTE: this list contains just the things which rootfs_ipk.bbclass does
 #    not add, rootfs_ipk.bbclass evaluates:
 #
-#        ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+#        ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
 #
 #    This is a priority ordered list - most desireable architecture at the end,
 #    so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
 #    THUMB_INTERWORK precede this with the other architectures.
-IPKG_ARCHS = "ixp4xx ${MACHINE} \
+IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
                ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
                (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
                + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \
@@ -146,7 +146,7 @@ IPKG_ARCHS = "ixp4xx ${MACHINE} \
 #    the removal of the raw "${MACHINE}" from the end of the list.  ${MACHINE} and
 #    ixp4xx are included at the start (lower priority) as the non-byte-sex specific
 #    versions.
-IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}"
+IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
 
 #-------------------------------------------------------------------------------
 # Package versions

diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf
index 2976e0a641ae11e4553ca05460239fdca1f23b50..e46796fede29375daa66e341a21aa7b81a53405e 100644 (file)
--- a/conf/machine/include/tune-iwmmxt.conf
+++ b/conf/machine/include/tune-iwmmxt.conf
@@ -1,6 +1,6 @@
 # Configurations for the Intel PXA27x Appications Processor Family. 
 # Please use tune-xscale for PXA255/PXA26x based processors.
-IPKG_ARCHS += "iwmmxt"
+IPKG_EXTRA_ARCHS += "iwmmxt"
 TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt"
 PACKAGE_ARCH = "iwmmxt"
 

diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index 1e3d3d777940a05c1790f4f3db8a99bbc539a1a1..02666360ba8836b24fe3396f4130aaac8f646fb7 100644 (file)
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -1,5 +1,5 @@
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 

diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 07753ccf64ca347c5419fac2ed50a71c69602631..f5cc893c9cb05cb611bb7b42ac60e028e9cf3ed0 100644 (file)
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
+IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700"
 #use this for a hx47xx ipaq
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 

diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index b3f54995c8deac37e05492bbf4c5d1a1284f7767..b5f8606cf5c71fb705e0ae0d3536d7a3db65602f 100644 (file)
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 56x palmtop computer
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"

diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index 5aa492f57df53f5d866d334c46ba55ebfee99f71..6521d159814b48f79b077b90ea14fb7c9548ea31 100644 (file)
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -3,6 +3,5 @@
 #@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer
 
 TARGET_ARCH = "sh3"
-IPKG_ARCHS = "all ${TARGET_ARCH} ${MACHINE}"
 
 include conf/machine/include/tune-sh3.conf

diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 82eff0b563ca5b0e279906def52f560889635e02..e8218138d513eecc11007fb5184cb1063a79cc25 100644 (file)
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -3,6 +3,5 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
 
 include conf/machine/include/tune-strongarm.conf
\ No newline at end of file

diff --git a/conf/machine/ks8695.conf b/conf/machine/ks8695.conf
index a3e7509e29bbddadb8ebb87731022ef42a1dd9de..5d214f7cfb7d6671539da5b78670bae6d018dfe4 100644 (file)
--- a/conf/machine/ks8695.conf
+++ b/conf/machine/ks8695.conf
@@ -6,7 +6,6 @@
 
 TARGET_ARCH = "arm"
 
-IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 require conf/machine/include/tune-arm920t.conf

diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf
index 68efccef3294c8e84ffbb485cd8b5a6d3e145283..2bf6cc2d8e1d1b2934b4661428ab460b75fd652c 100644 (file)
--- a/conf/machine/lite5200.conf
+++ b/conf/machine/lite5200.conf
@@ -1,5 +1,5 @@
 TARGET_ARCH = "powerpc"
-IPKG_ARCHS = "all ppc ${MACHINE}"
+IPKG_EXTRA_ARCHS = "ppc"
 UBOOT_MACHINE = "Lite5200"
 SERIAL_CONSOLE="38400 ttyS0"
 

diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index a171a213932ad0dc5df8eea03194de45ec76d26c..de242242a712345a355f629f88f1ca308947e37c 100644 (file)
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 
 GUI_MACHINE_CLASS = "smallscreen"
-IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 

diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf
index 02c3164da1fe7b17d5e292d31b89d10844226954..3a5f047ae0bbd82fb710dfb1a1869d4797393d3d 100644 (file)
--- a/conf/machine/mtx-1.conf
+++ b/conf/machine/mtx-1.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the mtx-1 (aka MeshCube)
 
 TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1"
 #PREFERRED_VERSION_linux-mtx-1 = "2.4.24"

diff --git a/conf/machine/native.conf b/conf/machine/native.conf
index 4817b2e3f13f89eaa2298e0bee9b2b091e087450..8caa6b9f1e06a386cdee2d2ce7c821e9b06fe2ea 100644 (file)
--- a/conf/machine/native.conf
+++ b/conf/machine/native.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for your build station
 
 TARGET_ARCH = "${BUILD_ARCH}"
-IPKG_ARCHS = "all ${TARGET_ARCH}"
 TARGET_PREFIX = ""
 VENDOR = "-oe"
 

diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index bcad9ccbe0c726b9cb4c136ade758c3cae36f890..9d483d4c55806d36a6c6118b8c737eeaa2d2d4a9 100644 (file)
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the IBM Netvista thin client
 
 TARGET_ARCH = "i386"
-IPKG_ARCHS = "all i386"
 PREFERRED_PROVIDER_xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils"

diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index d24324a598ebc8420e7bb269687ea48e6837d5dc..5708c78baf676578b01c90693600456441ff45f9 100644 (file)
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -2,7 +2,7 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""

diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf
index 9c460b44b8b6854e559a30d4a3a33e2d552a7789..bd367d43a0195221f89c57d20b937510a1837032 100644 (file)
--- a/conf/machine/omap1510inn.conf
+++ b/conf/machine/omap1510inn.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"

diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index 9c460b44b8b6854e559a30d4a3a33e2d552a7789..bd367d43a0195221f89c57d20b937510a1837032 100644 (file)
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"

diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf
index 9c460b44b8b6854e559a30d4a3a33e2d552a7789..bd367d43a0195221f89c57d20b937510a1837032 100644 (file)
--- a/conf/machine/omap1710h3.conf
+++ b/conf/machine/omap1710h3.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"

diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
index db333b2e19671a0a54449a3ae3987a7d9e653cfc..514069264e2d74f73c4eca22777cd12b89235d00 100644 (file)
--- a/conf/machine/omap2420h4.conf
+++ b/conf/machine/omap2420h4.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv5te armv6te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv5te armv6te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"

diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 822d766a9879a800e6a1ff0b2408df3ddd531238..dccc5a227b1d09e19d6d461e325cf2fea90b1e6c 100644 (file)
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the OMAP Starter Kit with a 5912 processor
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"

diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 8c83416919142db9e7c2da135876c03c4ab95414..79915e4f74bf2337731a2bb462939695de30b9f0 100644 (file)
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te poodle"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 ZKERNEL_VERSION ?= "2.4"
 include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf

diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index f3edef9890f3da126b0b5d9e5df932587836572c..022eb7f598560247d776f5890e7f5990ed9f3228 100644 (file)
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te qemuarm"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"

diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index a6439783f317f6eb69d919b67c38724ca777555c..43097d871e078cc0c96b7af19b135456d54f0647 100644 (file)
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -8,7 +8,6 @@ KERNEL ?= "kernel24"
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel24 = "opensimpad-64+0"
 PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"

diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf
index d73ab85f877820f90ca18e09b70dd11ec16ce9b3..5376be0ddad592d4b0caeeb6735c087ccd1ca52f 100644 (file)
--- a/conf/machine/sun4cdm.conf
+++ b/conf/machine/sun4cdm.conf
@@ -7,7 +7,5 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev"
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
 
-IPKG_ARCHS = "sparc"
-
 PREFERRED_PROVIDER_virtual/kernel = "linux-sun4cdm"
 

diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 3485937186fa57892ee078ff98650cdc4ce97894..751b498f14c430e17a93cdf575ccdc4924540e7d 100644 (file)
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te tosa"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
 ZKERNEL_VERSION ?= "2.4"
 include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf

diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf
index cb5c8fb9cda8352329e4c180a22f5652487410f3..671def34c3efc2b0f66c8f175314a393956cf8e9 100644 (file)
--- a/conf/machine/triton.conf
+++ b/conf/machine/triton.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the XScale based triton boards from KaRo Electronics 
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv5te"
 PREFERRED_PROVIDER_virtual/kernel = "triton-kernel"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel"

diff --git a/conf/machine/wl500g.conf b/conf/machine/wl500g.conf
index 18445ec17d81eeadf25f698a60759cd0f7d1269a..516d7091109eb1030d4234e4312dd7acb1f94fe4 100644 (file)
--- a/conf/machine/wl500g.conf
+++ b/conf/machine/wl500g.conf
@@ -4,4 +4,3 @@
 
 TARGET_ARCH = "mipsel"
 TARGET_CC_ARCH = "-Os -mips2"
-IPKG_ARCHS = "all mipsel ${MACHINE}"

diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf
index 569d78b5a0a22c3f7a917af11c859b47ce7b535e..f61570a95003b891d48bf595e37a7164cfc7a9b0 100644 (file)
--- a/conf/machine/wrt54.conf
+++ b/conf/machine/wrt54.conf
@@ -4,7 +4,6 @@
 
 TARGET_ARCH = "mipsel"
 TARGET_CC_ARCH = "-Os"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
 
 SERIAL_CONSOLE = "tts/0"
 

diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 02583c9fae8bfb7356e989021126436fe82dfc0c..0210b878105bac88c8d5e98d16f435e012cb302a 100644 (file)
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "i386"
 # TARGET_VENDOR = "-oe"
-IPKG_ARCHS = "all i386 x86"
+IPKG_EXTRA_ARCHS = "x86"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 

diff --git a/conf/machine/xxs1500.conf b/conf/machine/xxs1500.conf
index 75001814822c13b32b750d710fe57b69fec63ffa..9cc47cdef7e27f07baf32100568b2fbe6f532f91 100644 (file)
--- a/conf/machine/xxs1500.conf
+++ b/conf/machine/xxs1500.conf
@@ -5,7 +5,6 @@
 # pad size and SREC_VMAADDR would need to be changed for the xxs1500 rev B.
 
 TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-xxs1500"
 

diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 4ae2718c364ebe4097c0dbf992a9e0573199404f..286abb4d79e63796be303af9f31e31b881e61437 100644 (file)
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -42,7 +42,7 @@ EOF
         cat <<EOF >${SDK_DIR}/ipkg-target.conf
 src oe file:${DEPLOY_DIR_IPK}
 EOF
-       ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+       ipkgarchs="${IPKG_ARCHS}"
         priority=1
         for arch in $ipkgarchs; do
                 echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf

diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 707f92a68fb90d9289c535dfbce8f4011cba6218..8b303f307ca7b78b358ef09c40d210e7750d03af 100644 (file)
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -39,7 +39,7 @@ EOF
         cat <<EOF >${SDK_DIR}/ipkg-target.conf
 src oe file:${DEPLOY_DIR_IPK}
 EOF
-       ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+       ipkgarchs="${IPKG_ARCHS}"
         priority=1
         for arch in $ipkgarchs; do
                 echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf