From: Koen Kooi <koen@openembedded.org>
Date: Wed, 20 Jun 2007 13:09:55 +0000 (+0000)
Subject: angstrom: fix OABI package archs
X-Git-Tag: Release-2010-05/1~8868^2~299
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e005f7ef14ad4c004512e9a0deda05052af082a;p=openembedded.git

angstrom: fix OABI package archs
* downside: now there are 3 places for people to edit for people with oabi machines
---

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 6ef9646814..db293634f1 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -10,9 +10,12 @@
 DISTRO_VERSION = "test-${DATE}"
 DISTRO_REVISION = "46"
 
-require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
 
+#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+require conf/distro/include/angstrom${ARM_ABI}.inc
+
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace and gdb included
 # 'release' no root password, no strace and gdb by default
@@ -88,11 +91,6 @@ FEED_ARCH_simpad        = "arm-oabi"
 
 #Tweak packaging for strongarm machines since they can't use EABI
 
-PACKAGE_ARCH_collie     = "arm-oabi"
-PACKAGE_ARCH_h3600      = "arm-oabi"
-PACKAGE_ARCH_h3800      = "arm-oabi"
-PACKAGE_ARCH_simpad     = "arm-oabi"
-
 PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
 PACKAGE_EXTRA_ARCHS_h3600  = "arm-oabi"
 PACKAGE_EXTRA_ARCHS_h3800  = "arm-oabi"
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
new file mode 100644
index 0000000000..bb7bc45fbd
--- /dev/null
+++ b/conf/distro/include/angstromoabi.inc
@@ -0,0 +1,4 @@
+require conf/distro/include/angstrom.inc
+
+PACKAGE_ARCH     = "arm-oabi"
+