[PATCH 0/1][PULL] bitbake.conf: Include abi_version.conf in earlier stage

[PATCH 0/1][PULL] bitbake.conf: Include abi_version.conf in earlier stage

[Dongxiao Xu]

Hi Richard,

This pull request contains a commit that includes abi_version in earlier stage.

This is a fundamental change for another commit for meta-yocto layer, and I will send that to poky@yoctoproject.org mailing list.

Thanks,
Dongxiao

The following changes since commit e7135f14f3ef37f93f5c28b319464f3d6dd9b8da:

  gcc-configure-common.inc: Stop gcc looking at build system paths (2012-04-15 18:09:52 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dxu4/hob-bugfix-oecore
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-bugfix-oecore

Dongxiao Xu (1):
  bitbake.conf: Include abi_version.conf in a early stage

 meta/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
1.7.4.1

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

[Dongxiao Xu]

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(-)

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)
-- 
1.7.4.1