conf/machine: EXTRA_PACKAGES_ARCHS cleanup

All duplicates in EXTRA_PACKAGE_ARCHS are removed.

Moved EXTRA_PACKAGES_ARCHS to include/tune-* files (PPC and x86
targets), dropped it for ARM targets (as tune-arm* files have them
defined properly).

60 files changed, 16 insertions, 54 deletions

diff --git a/conf/machine/canyonlands.conf b/conf/machine/canyonlands.conf
index 177738b1ff..0a9446f678 100644
--- a/conf/machine/canyonlands.conf
+++ b/conf/machine/canyonlands.conf
@@ -6,7 +6,6 @@
 
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc440e"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.26"
diff --git a/conf/machine/d201gly2.conf b/conf/machine/d201gly2.conf
index 75a6920246..fb65dce765 100644
--- a/conf/machine/d201gly2.conf
+++ b/conf/machine/d201gly2.conf
@@ -6,9 +6,8 @@
 
 
 TARGET_ARCH = "i686"
-PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686 i686p4c"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 KERNEL_IMAGETYPE = "bzImage"
 OLDEST_KERNEL = "2.6.17"
 
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 25fb5b11a9..a033de1714 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -5,7 +5,6 @@
 #@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP  development platform
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 UBOOT_ENTRYPOINT = "0"
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 5bf42da797..dd4ba06f90 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the EFIKA development platform: http://www.pegasosppc.com/efika.php
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc603e"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-rt"
 
diff --git a/conf/machine/gumstix-custom-connex.conf b/conf/machine/gumstix-custom-connex.conf
index 65cbacad41..b59b056d3b 100644
--- a/conf/machine/gumstix-custom-connex.conf
+++ b/conf/machine/gumstix-custom-connex.conf
@@ -4,7 +4,6 @@
 
 MACHINE_FEATURES += "connex"
 require conf/machine/include/gumstix.inc
-require conf/machine/include/tune-xscale.inc
 
 #
 # Your flash size = Total flash (in MB) - 1 (for linux kernel partition)
diff --git a/conf/machine/gumstix-custom-verdex.conf b/conf/machine/gumstix-custom-verdex.conf
index 5e9360d9b0..97e4defa2c 100644
--- a/conf/machine/gumstix-custom-verdex.conf
+++ b/conf/machine/gumstix-custom-verdex.conf
@@ -5,7 +5,6 @@
 MACHINE_FEATURES += "verdex"
 MACHINE_FEATURES += "iwmmxt"
 require conf/machine/include/gumstix.inc
-require conf/machine/include/tune-xscale.inc
 
 #
 # Your flash size = Total flash (in MB) - 1 (for linux kernel partition)
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index c037226154..7bbb22354f 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -6,7 +6,6 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 "
 
 require conf/machine/include/tune-strongarm.inc
 
diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
index 2ae1419bae..30dbaeb5a8 100644
--- a/conf/machine/htcsable.conf
+++ b/conf/machine/htcsable.conf
@@ -6,7 +6,6 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf
index b311afe1b4..1c472f5a24 100644
--- a/conf/machine/htctornado.conf
+++ b/conf/machine/htctornado.conf
@@ -5,7 +5,6 @@
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2"
 
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index 34255a1536..4c5f1d6e57 100644
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -6,7 +6,6 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 "
 
 require conf/machine/include/tune-strongarm.inc
 
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 84733217d1..c9957e2b2f 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU 
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
+PACKAGE_EXTRA_ARCHS += "iwmmxt"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index 7918131cd3..02079d3a6b 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -6,8 +6,6 @@
 
 
 TARGET_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS = "x86"
-
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index b4d254ca50..56353777c3 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -6,7 +6,6 @@
 
 
 TARGET_ARCH = "i686"
-PACKAGE_EXTRA_ARCHS = "x86"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
index 4e5be154dd..0df6917699 100644
--- a/conf/machine/include/tune-pentium.inc
+++ b/conf/machine/include/tune-pentium.inc
@@ -1,4 +1,4 @@
 TARGET_CC_ARCH = "-march=pentium"
 BASE_PACKAGE_ARCH = "i586"
 FEED_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS += "i386 i486"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486"
diff --git a/conf/machine/include/tune-pentium4c.inc b/conf/machine/include/tune-pentium4c.inc
index 302eb3c4a0..42de0d9abd 100644
--- a/conf/machine/include/tune-pentium4c.inc
+++ b/conf/machine/include/tune-pentium4c.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-march=prescott"
 BASE_PACKAGE_ARCH = "i686p4c"
-
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
index 63dda25f58..9b9a8be42f 100644
--- a/conf/machine/include/tune-pentiumpro.inc
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -1,4 +1,4 @@
 TARGET_CC_ARCH = "-march=pentiumpro"
 BASE_PACKAGE_ARCH = "i686"
 FEED_ARCH = "i686"
-PACKAGE_EXTRA_ARCHS += "i386 i486 i586"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc
index a54aec0336..e5edd68040 100644
--- a/conf/machine/include/tune-ppc405.inc
+++ b/conf/machine/include/tune-ppc405.inc
@@ -3,3 +3,4 @@ TARGET_FPU   ?=  "soft"
 TARGET_CC_ARCH = "-mcpu=405"
 BASE_PACKAGE_ARCH = "ppc405"
 FEED_ARCH = "ppc405"
+PACKAGE_EXTRA_ARCHS += "ppc405"
diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc
index 7d7ca0ea11..feca186315 100644
--- a/conf/machine/include/tune-ppc440.inc
+++ b/conf/machine/include/tune-ppc440.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=440"
 BASE_PACKAGE_ARCH = "ppc440"
 FEED_ARCH = "ppc440"
+PACKAGE_EXTRA_ARCHS += "ppc440e"
diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc
index cbcef8a573..8b6955a817 100644
--- a/conf/machine/include/tune-ppc440e.inc
+++ b/conf/machine/include/tune-ppc440e.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=440fp -mhard-float"
 BASE_PACKAGE_ARCH = "ppc440e"
 FEED_ARCH = "ppc440e"
+PACKAGE_EXTRA_ARCHS += "ppc440e"
diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc
index f48dc26e05..2f627a725d 100644
--- a/conf/machine/include/tune-ppc603e.inc
+++ b/conf/machine/include/tune-ppc603e.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
 BASE_PACKAGE_ARCH = "ppc603e"
 FEED_ARCH = "ppc603e"
+PACKAGE_EXTRA_ARCHS += "ppc603e"
diff --git a/conf/machine/include/tune-ppce300c2.inc b/conf/machine/include/tune-ppce300c2.inc
index 41ddd4151a..1524c7cf86 100644
--- a/conf/machine/include/tune-ppce300c2.inc
+++ b/conf/machine/include/tune-ppce300c2.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=e300c2"
 BASE_PACKAGE_ARCH = "ppce300c2"
 FEED_ARCH = "ppce300c2"
+PACKAGE_EXTRA_ARCHS += "ppce300c2"
diff --git a/conf/machine/include/tune-ppce300c3.inc b/conf/machine/include/tune-ppce300c3.inc
index 24af11a8ba..467c4cc87f 100644
--- a/conf/machine/include/tune-ppce300c3.inc
+++ b/conf/machine/include/tune-ppce300c3.inc
@@ -1,3 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=e300c3"
 BASE_PACKAGE_ARCH = "ppce300c3"
 FEED_ARCH = "ppce300c3"
+PACKAGE_EXTRA_ARCHS += "ppce300c3"
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
index 37499a61dc..5745c36311 100644
--- a/conf/machine/include/tune-strongarm.inc
+++ b/conf/machine/include/tune-strongarm.inc
@@ -6,3 +6,4 @@ ARM_ABI = "oabi"
 TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
 FEED_ARCH = "arm-oabi"
 
+PACKAGE_EXTRA_ARCHS += "armv4 "
diff --git a/conf/machine/include/tune-x86-nocona.inc b/conf/machine/include/tune-x86-nocona.inc
index f1189a171e..9bee740dd4 100644
--- a/conf/machine/include/tune-x86-nocona.inc
+++ b/conf/machine/include/tune-x86-nocona.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-march=nocona"
 TARGET_CC_KERNEL_ARCH = "-march=nocona"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
diff --git a/conf/machine/include/tune-x86-prescott.inc b/conf/machine/include/tune-x86-prescott.inc
index f3ec4e956a..0a584f085a 100644
--- a/conf/machine/include/tune-x86-prescott.inc
+++ b/conf/machine/include/tune-x86-prescott.inc
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-march=prescott"
 TARGET_CC_KERNEL_ARCH = "-march=prescott"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf
index 5b88f457fa..a25290e589 100644
--- a/conf/machine/kb9202.conf
+++ b/conf/machine/kb9202.conf
@@ -5,7 +5,6 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 require conf/machine/include/tune-arm920t.inc
 
diff --git a/conf/machine/kilauea.conf b/conf/machine/kilauea.conf
index 0ec14a9c5d..883448c062 100644
--- a/conf/machine/kilauea.conf
+++ b/conf/machine/kilauea.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the AMCC Kilauea (405EX)
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf
index b67d3dc500..16a723cd1c 100644
--- a/conf/machine/lite5200.conf
+++ b/conf/machine/lite5200.conf
@@ -1,5 +1,4 @@
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc"
 UBOOT_MACHINE = "Lite5200"
 SERIAL_CONSOLE="38400 ttyS0"
 
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index a046c5d00c..01bd1e2eca 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -7,7 +7,6 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.19.2"
 GUI_MACHINE_CLASS = "smallscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf
index 1792cda280..88a1be34dc 100644
--- a/conf/machine/looxc550.conf
+++ b/conf/machine/looxc550.conf
@@ -6,7 +6,6 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf
index 9839b6d69e..bd29837fbb 100644
--- a/conf/machine/magicbox.conf
+++ b/conf/machine/magicbox.conf
@@ -7,7 +7,6 @@
 INHERIT += "magicbox-image"
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
diff --git a/conf/machine/mp900c.conf b/conf/machine/mp900c.conf
index 37055be2bb..38b70a22c0 100644
--- a/conf/machine/mp900c.conf
+++ b/conf/machine/mp900c.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the PXA255 based Mobile Pro 9xx palmtop computer
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 83167b10ce..ed2579c8c0 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Freescale MPC8313E-RDB
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppce300c3"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 
diff --git a/conf/machine/mpc8315e-rdb.conf b/conf/machine/mpc8315e-rdb.conf
index e0a1215bcf..7d3a93b815 100644
--- a/conf/machine/mpc8315e-rdb.conf
+++ b/conf/machine/mpc8315e-rdb.conf
@@ -6,7 +6,6 @@
 # PCI Express x1, 2x SATA.
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppce300c3"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
index 78c9b8a462..e01aeaadb3 100644
--- a/conf/machine/mpc8323e-rdb.conf
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppce300c2"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 
diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf
index ac7a6c19f3..d6d14d86df 100644
--- a/conf/machine/mtx-3.conf
+++ b/conf/machine/mtx-3.conf
@@ -8,7 +8,6 @@
 # TARGET_ARCH should be set here in the machine configuration.
 # For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 require conf/machine/include/tune-arm926ejs.inc
 
 
diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf
index 0a092563fe..3abfa493dc 100644
--- a/conf/machine/mx21ads.conf
+++ b/conf/machine/mx21ads.conf
@@ -7,7 +7,6 @@ TARGET_ARCH = "arm"
 MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget"
 
 GUI_MACHINE_CLASS = "smallscreen"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
 PREFERRED_PROVIDER_virtua