[oe-commits] org.oe.dev angstrom 2007: lockdown file takes precendence over other files

[koen commit]

angstrom 2007: lockdown file takes precendence over other files

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 73811d7124650e66801380a8372e169d5ed3e6bf
ViewMTN: http://monotone.openembedded.org/revision/info/73811d7124650e66801380a8372e169d5ed3e6bf
Files:
1
conf/distro/angstrom-2007.1.conf
Diffs:

#
# mt diff -r3de8a5cd0781ed4b4c9268058f3afa82adfdc0c0 -r73811d7124650e66801380a8372e169d5ed3e6bf
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [5d6ed6b4b601b39ffd196b48f39254620f34fc34]
#    to [483bd2a92ce8f54e704feeca7f6698e99ec1b985]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	5d6ed6b4b601b39ffd196b48f39254620f34fc34
+++ conf/distro/angstrom-2007.1.conf	483bd2a92ce8f54e704feeca7f6698e99ec1b985
@@ -126,6 +126,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 # PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+require conf/distro/include/angstrom-2007-preferred-versions.inc
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions.inc
@@ -193,10 +194,6 @@ PREFERRED_PROVIDER_task-bootstrap = "tas
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
-
-# Lock down almost every recipe:
-require conf/distro/include/angstrom-2007-preferred-versions.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