conf/machine: Set BASE_PACKAGE_ARCH which is then used to construct PACKAGE_ARCH...

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 8933436517685ac96aafc32341973d3a863773cf..8ee1cc6838781190834af755b673c3624d9735b7 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -86,7 +86,8 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS'
 TARGET_PREFIX = "${TARGET_SYS}-"
 TARGET_CC_ARCH = ""
 
-PACKAGE_ARCH = "${HOST_ARCH}"
+BASE_PACKAGE_ARCH = "${HOST_ARCH}"
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
 PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
 

diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 65a82d1e0be93eb0ab57ef342367339272b24334..4657d48b7925c3af44b9d156dc6f9f55c1ae64c2 100644 (file)
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_ARCH = "arm"
+BASE_PACKAGE_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc

diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf
index f5f6cb5c6639115781275870186fd9875503ca60..eba677fae7fa89b775559ab7ea0cb797119f4635 100644 (file)
--- a/conf/machine/htckaiser.conf
+++ b/conf/machine/htckaiser.conf
@@ -13,7 +13,7 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
  
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
 FEED_ARCH = "armv6"
-PACKAGE_ARCH = "armv6"
+BASE_PACKAGE_ARCH = "armv6"
  
 
 IMAGE_FSTYPES ?= "tar.gz cpio.gz"

diff --git a/conf/machine/include/tune-arm1136jf-s.inc b/conf/machine/include/tune-arm1136jf-s.inc
index a69df825c0864a9d938439e42ba642bfdd9210f3..0f5aef5ea4cb090dd5ef87bbe4036218032f656b 100644 (file)
--- a/conf/machine/include/tune-arm1136jf-s.inc
+++ b/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv6"
-PACKAGE_ARCH = "armv6"
+BASE_PACKAGE_ARCH = "armv6"

diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc
index b142d3325a3a330b47ecafa39a2a0c346832c2bb..1f7a04bb3b905cc24609562440ec2143d0fd530d 100644 (file)
--- a/conf/machine/include/tune-arm920t.inc
+++ b/conf/machine/include/tune-arm920t.inc
@@ -1,4 +1,4 @@
 FEED_ARCH = "armv4t"
-PACKAGE_ARCH = "armv4t" 
+BASE_PACKAGE_ARCH = "armv4t" 
 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
 

diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc
index c3e8d7aefc46344654459d77eddf589697f709c9..e80ef1049043d2236914a65d757887ce445906f1 100644 (file)
--- a/conf/machine/include/tune-arm926ejs.inc
+++ b/conf/machine/include/tune-arm926ejs.inc
@@ -4,4 +4,4 @@ FEED_ARCH = "armv5te"
 #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 # For gcc 4.x you need:
 TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
-PACKAGE_ARCH = "armv5te"
+BASE_PACKAGE_ARCH = "armv5te"

diff --git a/conf/machine/include/tune-arm9tdmi.inc b/conf/machine/include/tune-arm9tdmi.inc
index ded2c1b732fb428a3fca7c1b4dfd7c9599e427b7..50aaec1320bc3a5d79da123028c82b00d5f8d1a3 100644 (file)
--- a/conf/machine/include/tune-arm9tdmi.inc
+++ b/conf/machine/include/tune-arm9tdmi.inc
@@ -1,3 +1,3 @@
 FEED_ARCH = "armv4t"
-PACKAGE_ARCH = "armv4t"
+BASE_PACKAGE_ARCH = "armv4t"
 TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"

diff --git a/conf/machine/include/tune-armv7.inc b/conf/machine/include/tune-armv7.inc
index 6276fe679883d0ad221a1e084a9b2c120bafec8a..96c8c64904909a8851521f476e9db01f2b3217ae 100644 (file)
--- a/conf/machine/include/tune-armv7.inc
+++ b/conf/machine/include/tune-armv7.inc
@@ -3,4 +3,4 @@
 # This will NOT compile programs in 'ARM' mode, which is what you really want
 TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv7"
-PACKAGE_ARCH = "armv7"
+BASE_PACKAGE_ARCH = "armv7"

diff --git a/conf/machine/include/tune-at32ap7000.inc b/conf/machine/include/tune-at32ap7000.inc
index 2efe0bb3e28f208b0628de1a85ebe5a02eee00d1..666dd21a016c0e902719319d9df06f698286a20e 100644 (file)
--- a/conf/machine/include/tune-at32ap7000.inc
+++ b/conf/machine/include/tune-at32ap7000.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-march=ap"
-PACKAGE_ARCH = "avr32"
+BASE_PACKAGE_ARCH = "avr32"
 FEED_ARCH = "avr32"

diff --git a/conf/machine/include/tune-athlonmp.inc b/conf/machine/include/tune-athlonmp.inc
index 167559aa857085c11ac9e64e4c479f98ecf99648..313300d9cd0e35e01e02481a318702ad7d757671 100644 (file)
--- a/conf/machine/include/tune-athlonmp.inc
+++ b/conf/machine/include/tune-athlonmp.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-march=i686"
-PACKAGE_ARCH = "i686"
+BASE_PACKAGE_ARCH = "i686"
 FEED_ARCH = "i686"

diff --git a/conf/machine/include/tune-c3.inc b/conf/machine/include/tune-c3.inc
index 00db9d0445528a53b5c05440d1890c4bd0dac4d6..43849086f4d30013be06c51d19f90057511a47be 100644 (file)
--- a/conf/machine/include/tune-c3.inc
+++ b/conf/machine/include/tune-c3.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-march=c3 -mtune=c3"
-PACKAGE_ARCH = "i586"
+BASE_PACKAGE_ARCH = "i586"
 FEED_ARCH = "i586"

diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index 51f6f3d72b1ba5eb851b540e60d5f46c77f7029a..4216255102078790af16c5f49230d2e0477fa052 100644 (file)
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/conf/machine/include/tune-cortexa8.inc
@@ -5,4 +5,4 @@
 
 TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
 FEED_ARCH = "armv7a"
-PACKAGE_ARCH = "armv7a"
+BASE_PACKAGE_ARCH = "armv7a"

diff --git a/conf/machine/include/tune-cortexm1.inc b/conf/machine/include/tune-cortexm1.inc
index a0d18b69c63ce3ab56603685cb4953603aca530f..6c4a70a24d12f722b935149e01c0024a24a46bdd 100644 (file)
--- a/conf/machine/include/tune-cortexm1.inc
+++ b/conf/machine/include/tune-cortexm1.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv6"
-PACKAGE_ARCH = "armv6"
+BASE_PACKAGE_ARCH = "armv6"

diff --git a/conf/machine/include/tune-cortexm3.inc b/conf/machine/include/tune-cortexm3.inc
index 3598998a74b45dda277dea0005cc6df2d91c59e1..6da9aeedda496d5404373ebc1056d673ffd9752f 100644 (file)
--- a/conf/machine/include/tune-cortexm3.inc
+++ b/conf/machine/include/tune-cortexm3.inc
@@ -1,4 +1,4 @@
 # valid options for -march: `armv7', `armv7-m'
 TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv7"
-PACKAGE_ARCH = "armv7"
+BASE_PACKAGE_ARCH = "armv7"

diff --git a/conf/machine/include/tune-cortexr4.inc b/conf/machine/include/tune-cortexr4.inc
index 93c82e8607e8badd9e5be9bae6fb8c4a31d5385d..b8bb7f50ae4f40f8b49048f9320dd47d2b17d648 100644 (file)
--- a/conf/machine/include/tune-cortexr4.inc
+++ b/conf/machine/include/tune-cortexr4.inc
@@ -1,4 +1,4 @@
 # valid options for -march: `armv7', `armv7-r'
 TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp"
 FEED_ARCH = "armv7"
-PACKAGE_ARCH = "armv7"
+BASE_PACKAGE_ARCH = "armv7"

diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc
index 76ccc1a1e3b6aca2756377e456659671c1214c37..7da1cb50c8b6aa519913a75406f44aad3f9b7603 100644 (file)
--- a/conf/machine/include/tune-ep9312.inc
+++ b/conf/machine/include/tune-ep9312.inc
@@ -2,6 +2,6 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
 # add "-mfp=maverick" for newer gcc versions > 4.0
 
 #set arch to ep9312 for all generated packages
-PACKAGE_ARCH = "ep9312"
+BASE_PACKAGE_ARCH = "ep9312"
 FEED_ARCH = "ep9312"
 

diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc
index c167515d46b9b5dc06b5074d12a8b3c3242d4934..7e6562ad46ffbff8b4a755e62b8615f2409c8542 100644 (file)
--- a/conf/machine/include/tune-geodelx.inc
+++ b/conf/machine/include/tune-geodelx.inc
@@ -2,6 +2,6 @@
 # in older versions k6-2 is closest
 #
 TARGET_CC_ARCH = "-march=k6-2"
-PACKAGE_ARCH = "geode"
+BASE_PACKAGE_ARCH = "geode"
 FEED_ARCH = "geode"
 

diff --git a/conf/machine/include/tune-iwmmxt.inc b/conf/machine/include/tune-iwmmxt.inc
index 20fe82b584ed5b3be7eb521f05e481c20654f062..aa5aaee9018125a8d5b6a862e0e950e5b86e6d59 100644 (file)
--- a/conf/machine/include/tune-iwmmxt.inc
+++ b/conf/machine/include/tune-iwmmxt.inc
@@ -1,7 +1,7 @@
 # Configurations for the Intel PXA27x Appications Processor Family. 
 # Please use tune-xscale for PXA255/PXA26x based processors.
 TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH = "iwmmxt"
+BASE_PACKAGE_ARCH = "iwmmxt"
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
 FEED_ARCH = "iwmmxt"
 

diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
index 008d63daa84c4515205de51b0b10a19723a421de..6b8c9b521f42d11149834280314187aea9c5f44d 100644 (file)
--- a/conf/machine/include/tune-pentium.inc
+++ b/conf/machine/include/tune-pentium.inc
@@ -1,4 +1,4 @@
 TARGET_CC_ARCH = "-march=pentium"
-PACKAGE_ARCH = "i586"
+BASE_PACKAGE_ARCH = "i586"
 FEED_ARCH = "i586"
 

diff --git a/conf/machine/include/tune-pentium4c.inc b/conf/machine/include/tune-pentium4c.inc
index 092f705d1db426c7af94bcdbd59fbbf9a7855964..302eb3c4a0cea2b5cdbd709065dad0b9ae1caea9 100644 (file)
--- a/conf/machine/include/tune-pentium4c.inc
+++ b/conf/machine/include/tune-pentium4c.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-march=prescott"
-PACKAGE_ARCH = "i686p4c"
+BASE_PACKAGE_ARCH = "i686p4c"
 

diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
index 3406bb0c712a513800debdb94d33d269ce070eb4..88fe7d7445910f74be8ac8ff85d142870fb72797 100644 (file)
--- a/conf/machine/include/tune-pentiumpro.inc
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -1,4 +1,4 @@
 TARGET_CC_ARCH = "-march=pentiumpro"
-PACKAGE_ARCH = "i686"
+BASE_PACKAGE_ARCH = "i686"
 FEED_ARCH = "i686"
 

diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc
index f798df837cc1bb667c58929e08b724095f62c46c..a54aec0336f7ac1293aa247dbcf2f98e7dc5c70c 100644 (file)
--- a/conf/machine/include/tune-ppc405.inc
+++ b/conf/machine/include/tune-ppc405.inc
@@ -1,5 +1,5 @@
 #default to soft-floats if distro/machine/local.conf don't define anything else
 TARGET_FPU   ?=  "soft"
 TARGET_CC_ARCH = "-mcpu=405"
-PACKAGE_ARCH = "ppc405"
+BASE_PACKAGE_ARCH = "ppc405"
 FEED_ARCH = "ppc405"

diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc
index d38adac0080f621fc6caaf3d1c432d364b292f3c..7d7ca0ea1143a7538b9d3d6f1f7d7ceb1650fe20 100644 (file)
--- a/conf/machine/include/tune-ppc440.inc
+++ b/conf/machine/include/tune-ppc440.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=440"
-PACKAGE_ARCH = "ppc440"
+BASE_PACKAGE_ARCH = "ppc440"
 FEED_ARCH = "ppc440"

diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc
index 539fa2d06594cbc23484ad25f5ce35547df785cd..cbcef8a5732688e2742ac2f1f73baf507a5b31f3 100644 (file)
--- a/conf/machine/include/tune-ppc440e.inc
+++ b/conf/machine/include/tune-ppc440e.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=440fp -mhard-float"
-PACKAGE_ARCH = "ppc440e"
+BASE_PACKAGE_ARCH = "ppc440e"
 FEED_ARCH = "ppc440e"

diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc
index 0305a129b9a6d25df7a6df56419140f91b0fb605..f48dc26e05ec95c9a12be7aa84626bbb45fdcece 100644 (file)
--- a/conf/machine/include/tune-ppc603e.inc
+++ b/conf/machine/include/tune-ppc603e.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
-PACKAGE_ARCH = "ppc603e"
+BASE_PACKAGE_ARCH = "ppc603e"
 FEED_ARCH = "ppc603e"

diff --git a/conf/machine/include/tune-ppce300c2.inc b/conf/machine/include/tune-ppce300c2.inc
index ddf9de00ce725dd8e43ce5eeac32f408ca2caeec..41ddd4151ab4a38bdd01e449e278f8f91d8246af 100644 (file)
--- a/conf/machine/include/tune-ppce300c2.inc
+++ b/conf/machine/include/tune-ppce300c2.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=e300c2"
-PACKAGE_ARCH = "ppce300c2"
+BASE_PACKAGE_ARCH = "ppce300c2"
 FEED_ARCH = "ppce300c2"

diff --git a/conf/machine/include/tune-ppce300c3.inc b/conf/machine/include/tune-ppce300c3.inc
index 769c18720d1d69b0005a7fef839f5b42e63046dd..24af11a8ba83063d4d8e4a63e360f34a14164f33 100644 (file)
--- a/conf/machine/include/tune-ppce300c3.inc
+++ b/conf/machine/include/tune-ppce300c3.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=e300c3"
-PACKAGE_ARCH = "ppce300c3"
+BASE_PACKAGE_ARCH = "ppce300c3"
 FEED_ARCH = "ppce300c3"

diff --git a/conf/machine/include/tune-ppce500.inc b/conf/machine/include/tune-ppce500.inc
index 7a0476e5b7e8b8cc41884f9666c015a1364f1a4c..9c8c68c3424fea0c713700c9aa2d3c6937389559 100644 (file)
--- a/conf/machine/include/tune-ppce500.inc
+++ b/conf/machine/include/tune-ppce500.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=8540"
-PACKAGE_ARCH = "ppce500"
+BASE_PACKAGE_ARCH = "ppce500"
 FEED_ARCH = "ppce500"

diff --git a/conf/machine/include/tune-supersparc.inc b/conf/machine/include/tune-supersparc.inc
index 5fbfabe8d3019d2520702f7b536bf61bc4a2b416..a402e7cd2b4f33d526159f09985437b712efd7af 100644 (file)
--- a/conf/machine/include/tune-supersparc.inc
+++ b/conf/machine/include/tune-supersparc.inc
@@ -1,3 +1,3 @@
 TARGET_CC_ARCH = "-mcpu=supersparc"
-PACKAGE_ARCH = "supersparc"
+BASE_PACKAGE_ARCH = "supersparc"
 FEED_ARCH = "supersparc" 

diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc
index d5ef105e9741b357e2042364a988d7af63d752d8..eb16651ae37ea1d891554210a24a5e37ee33ecb9 100644 (file)
--- a/conf/machine/include/tune-xscale.inc
+++ b/conf/machine/include/tune-xscale.inc
@@ -2,4 +2,4 @@ FEED_ARCH =  "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d,
 
 TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
 TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
-PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"