Adjust for new tune infrastructure

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

conf/distro/include/angstrom-core-tweaks.inc

@@ -1,5 +1,12 @@
 # This include is to import changes from OE that are hard to overlay into core
 
+# Tuning and package arch compatibility
+
+# Turn armv7a-vfp-neon into armv7a for compatibility reasons
+# In the long term the switch to the longer arch needs to be made,
+# but that needs a coordinated effort
+PKGARCHCOMPAT_ARMV7A = True
+
 # Providers
 
 # Prefer the one from meta-oe over the one in oe-core
@@ -26,7 +33,7 @@ XSERVER_qemux86-64 = "xserver-xorg \
 
 # bitbake.conf stuff:
 
-TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/bin/${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
+TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/bin/${TUNE_PKGARCH}${HOST_VENDOR}-${HOST_OS}"
 TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}"
 
 # Image.bbclass stuff:

conf/distro/include/angstrom-eglibc.inc

@@ -9,7 +9,7 @@ TARGET_OS = "linux"
 #TARGET_OS = "${@compute_os_portion_of_target_triplet(d)}"
 
 TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce500', 'ppce500v2']]}"
+TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TUNE_PKGARCH',d,1) in ['ppce500', 'ppce500v2']]}"
 
 # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"

conf/distro/include/angstrom.inc

@@ -20,7 +20,7 @@ ONLINE_PACKAGE_MANAGEMENT = "full"
 #Set the right arch for the feeds
 #Alphabetically sorted
 
-FEED_ARCH ?= "${BASE_PACKAGE_ARCH}"
+FEED_ARCH ?= "${TUNE_PKGARCH}"
 
 #blackfin machines
 FEED_ARCH_bfin          = "blackfin"