Patchwork [1/1] bitbake.conf: Include abi_version.conf in a early stage

login
mail settings
Submitter Dongxiao Xu
Date April 16, 2012, 7:52 a.m.
Message ID <762170e63dc2157f377eec792e12499d38036c4b.1334562084.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/25895/
State Accepted
Commit 4e1a8ed1ab7e7bd950e511c79ddfe072cb280a6e
Headers show

Comments

Dongxiao Xu - April 16, 2012, 7:52 a.m.
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@intel.com>
---
 meta/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

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)