summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-04-16 07:52:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 11:52:11 (GMT)
commite737d01095a122f483837a99274e932f47747bf7 (patch)
tree52cb5e5bcfb0ee73552a7477ebd6cacc4d16e8dc /meta/conf
parentd1eba59ffd14ddad2bbb7fcecd3538245febe92e (diff)
downloadpoky-e737d01095a122f483837a99274e932f47747bf7.tar.gz
bitbake.conf: Include abi_version.conf in a early stage
We may define new OELAYOUT_ABI variable in ${DISTRO}.conf, therefore we need to move the abi_version.conf before that. (From OE-Core rev: 4e1a8ed1ab7e7bd950e511c79ddfe072cb280a6e) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b4669d3..501863b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -648,6 +648,7 @@ CPU_FEATURES_arm ?= "vfp"
648# Include the rest of the config files. 648# Include the rest of the config files.
649################################################################## 649##################################################################
650 650
651require conf/abi_version.conf
651include conf/site.conf 652include conf/site.conf
652include conf/auto.conf 653include conf/auto.conf
653include conf/local.conf 654include conf/local.conf
@@ -659,7 +660,6 @@ include conf/distro/${DISTRO}.conf
659include conf/distro/defaultsetup.conf 660include conf/distro/defaultsetup.conf
660include conf/documentation.conf 661include conf/documentation.conf
661require conf/sanity.conf 662require conf/sanity.conf
662require conf/abi_version.conf
663 663
664################################################################## 664##################################################################
665# Weak variables (usually to retain backwards compatibility) 665# Weak variables (usually to retain backwards compatibility)