summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-11-04 16:01:41 +0000
committerKoen Kooi <koen@openembedded.org>2007-11-04 16:01:41 +0000
commit6457ba4d43022d4f9840a21b0e161c658cae4d2e (patch)
tree01191eb3de5dc0629cc285ee718636dec65b9f12 /conf
parent5cc7a81c5c882c88d834bac573a240ff9b2524a1 (diff)
angstrom 2007: lockdown file takes precendence over other files
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf5
1 files changed, 1 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 542199d37c..7e50500578 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -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_gdk-pixbuf-loader-xpm ?= "gtk+"
#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