[oe-commits] Dongxiao Xu : bitbake.conf: Include abi_version.conf in a early stage

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 4e1a8ed1ab7e7bd950e511c79ddfe072cb280a6e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4e1a8ed1ab7e7bd950e511c79ddfe072cb280a6e

Author: Dongxiao Xu <dongxiao.xu at intel.com>
Date:   Mon Apr 16 15:52:01 2012 +0800

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.

Signed-off-by: Dongxiao Xu <dongxiao.xu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/bitbake.conf |    2 +-
 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"
 # Include the rest of the config files.
 ##################################################################
 
+require conf/abi_version.conf
 include conf/site.conf
 include conf/auto.conf
 include conf/local.conf
@@ -659,7 +660,6 @@ include conf/distro/${DISTRO}.conf
 include conf/distro/defaultsetup.conf
 include conf/documentation.conf
 require conf/sanity.conf
-require conf/abi_version.conf
 
 ##################################################################
 # Weak variables (usually to retain backwards compatibility)