conf/machine: Set BASE_PACKAGE_ARCH which is then used to construct PACKAGE_ARCH instead of setting directly. This allows us to experiment with various changes which wouldn't otherwise be possible (from poky)

30 files changed, 31 insertions, 30 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 8933436517..8ee1cc6838 100644
--- 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 65a82d1e0b..4657d48b79 100644
--- 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 f5f6cb5c66..eba677fae7 100644
--- 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 a69df825c0..0f5aef5ea4 100644
--- 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 b142d3325a..1f7a04bb3b 100644
--- 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 c3e8d7aefc..e80ef10490 100644
--- 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 ded2c1b732..50aaec1320 100644
--- 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 6276fe6798..96c8c64904 100644
--- 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 2efe0bb3e2..666dd21a01 100644
--- 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 167559aa85..313300d9cd 100644
--- 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 00db9d0445..43849086f4 100644
--- 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 51f6f3d72b..4216255102 100644
--- 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 a0d18b69c6..6c4a70a24d 100644
--- 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 3598998a74..6da9aeedda 100644
--- 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 93c82e8607..b8bb7f50ae 100644
--- 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 76ccc1a1e3..7da1cb50c8 100644
--- 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 c167515d46..7e6562ad46 100644
--- 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 20fe82b584..aa5aaee901 100644
--- 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 008d63daa8..6b8c9b521f 100644
--- 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 092f705d1d..302eb3c4a0 100644
--- 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 3406bb0c71..88fe7d7445 100644
--- 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 f798df837c..a54aec0336 100644
--- 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 d38adac008..7d7ca0ea11 100644
--- 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 539fa2d065..cbcef8a573 100644
--- 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 0305a129b9..f48dc26e05 100644
--- 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 ddf9de00ce..41ddd4151a 100644
--- 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 769c18720d..24af11a8ba 100644
--- 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 7a0476e5b7..9c8c68c342 100644
--- 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 5fbfabe8d3..a402e7cd2b 100644
--- 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 d5ef105e97..eb16651ae3 100644
--- 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']}"