[oe-commits] org.oe.dev angstrom: fix OABI package archs

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: ef18f00dc16fe77fe2fd46a7dbf853dfe443b8c3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ef18f00dc16fe77fe2fd46a7dbf853dfe443b8c3
Files:
1
conf/distro/include/angstromoabi.inc
conf/distro/angstrom-2007.1.conf
Diffs:

#
# mt diff -ra70445de7587a858409c3436354ffa7820d138ba -ref18f00dc16fe77fe2fd46a7dbf853dfe443b8c3
#
# 
# 
# add_file "conf/distro/include/angstromoabi.inc"
#  content [8bbd28f3f048aed0633f53696a88f33dc442c7a5]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [5500448bf0e479213f7d0dda5db7108ce36e74ba]
#    to [de32e58e4e734e8bb6eeefcb092a3631d12949b0]
# 
============================================================
--- conf/distro/include/angstromoabi.inc	8bbd28f3f048aed0633f53696a88f33dc442c7a5
+++ conf/distro/include/angstromoabi.inc	8bbd28f3f048aed0633f53696a88f33dc442c7a5
@@ -0,0 +1,4 @@
+require conf/distro/include/angstrom.inc
+
+PACKAGE_ARCH     = "arm-oabi"
+
============================================================
--- conf/distro/angstrom-2007.1.conf	5500448bf0e479213f7d0dda5db7108ce36e74ba
+++ conf/distro/angstrom-2007.1.conf	de32e58e4e734e8bb6eeefcb092a3631d12949b0
@@ -10,9 +10,12 @@ DISTRO_REVISION = "46"
 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"