Module: meta-angstrom
Branch: master
Commit: 1abf2de2e34042063714720f3d3c59dfb7de7cdc
Author: Koen Kooi <k...@dominion.thruhere.net>
Date: Wed Jul 27 10:31:25 2011 +0200
Adjust for new tune infrastructure
Signed-off-by: Koen Kooi <k...@dominion.thruhere.net>
---
conf/distro/include/angstrom-core-tweaks.inc | 9 ++++++++-
conf/distro/include/angstrom-eglibc.inc | 2 +-
conf/distro/include/angstrom.inc | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/conf/distro/include/angstrom-core-tweaks.inc
b/conf/distro/include/angstrom-core-tweaks.inc
index cc76c4e..8e59160 100644
--- a/conf/distro/include/angstrom-core-tweaks.inc
+++ b/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:
diff --git a/conf/distro/include/angstrom-eglibc.inc
b/conf/distro/include/angstrom-eglibc.inc
index 99f8c1e..12abd58 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/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"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 7fe5852..14013be 100644
--- a/conf/distro/include/angstrom.inc
+++ b/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"
_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
