[oe-commits] org.oe.dev angstrom: move include so it can override more parts

[koen commit]

angstrom: move include so it can override more parts

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

#
# mt diff -r2029e85b7f8fdb16e1031a5eaa330471736c6605 -r7f1ed839c23672cd64720d77109183d3205acbae
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [130e9306ef9ffabf334b2c8549419be52677db82]
#    to [81a4b9e96eb00492f039bc10f99adc1a4946a3bd]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	130e9306ef9ffabf334b2c8549419be52677db82
+++ conf/distro/angstrom-2007.1.conf	81a4b9e96eb00492f039bc10f99adc1a4946a3bd
@@ -12,10 +12,6 @@ require conf/distro/include/sane-srcdate
 
 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', 'htcwallaby']]}"
-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
@@ -298,21 +294,10 @@ PREFERRED_PROVIDER_task-bootstrap = "tas
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
+#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', 'htcwallaby']]}"
+require conf/distro/include/angstrom${ARM_ABI}.inc
 
-
-#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
-# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad
-
-
-# add altboot to compatible models, will be replaced with angstrom-bootmanager
-#PREFERRED_VERSION_altboot = "1.0.8+1.0.9_pre1"
-#EXTRA_STUFF_append_c7x0          +=  "altboot"
-#EXTRA_STUFF_append_akita         += "altboot"
-#EXTRA_STUFF_append_poodle        += "altboot"
-#EXTRA_STUFF_append_tosa          += "altboot"
-#EXTRA_STUFF_append_spitz         += "altboot"
-
-
 # do some task-base stuff here
 
 # We want to ship extra debug utils in the rootfs when doing a debug build