From: Koen Kooi Date: Sun, 4 Nov 2007 16:01:41 +0000 (+0000) Subject: angstrom 2007: lockdown file takes precendence over other files X-Git-Tag: Release-2010-05/1~8454^2~20 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6457ba4d43022d4f9840a21b0e161c658cae4d2e;p=openembedded.git angstrom 2007: lockdown file takes precendence over other files --- 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