[PATCH 0/2] Add MACHINEOVERRIDES variable to bitbake.conf

[PATCH 0/2] Add MACHINEOVERRIDES variable to bitbake.conf

[Khem Raj]

Pull URL: git://git.openembedded.org/openembedded-core-contrib
  Branch: kraj/misc-fixes
  Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes

Thanks,
    Khem Raj <raj.khem@gmail.com>
---


Khem Raj (2):
  conf/bitbake.conf: Add MACHINEOVERRIDES variable
  util-linux: inherit pkgconfig

 meta/conf/bitbake.conf                      |    3 ++-
 meta/recipes-core/util-linux/util-linux.inc |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
1.7.4.1

[PATCH 1/2] conf/bitbake.conf: Add MACHINEOVERRIDES variable

[Khem Raj]

By defualt it points to $MACHINE but sometimes its desired
to have more than one overrides stemming out of a machine
then they can be added to MACHINEOVERRIDES.

e.g. MACHINEOVERRIDES = "${MACHINE}:nslu2"

Note that if you redefine MACHINEOVERRIDES then default
override for machine has to be added to it explicitly
otherwise it will get lost.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/bitbake.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7c72de1..8b6236e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -610,8 +610,9 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 #
 # This works for  functions as well, they are really just environment variables.
 # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
-OVERRIDES = "local:${MACHINE}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable"
+OVERRIDES = "local:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable"
 DISTROOVERRIDES ?= "${DISTRO}"
+MACHINEOVERRIDES ?= "${MACHINE}"
 
 CPU_FEATURES ?= ""
 CPU_FEATURES_arm ?= "vfp"
-- 
1.7.4.1

[PATCH 2/2] util-linux: inherit pkgconfig

[Khem Raj]

Configure of util-linux used pkg-config to poke for gtk-doc versions
so we need this dependency on pkgconfig

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/util-linux/util-linux.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 447e5b7..489ec1a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9
                     file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
                     file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-inherit autotools gettext
+inherit autotools gettext pkgconfig
 DEPENDS = "zlib ncurses"
 DEPENDS_virtclass-native_append = " lzo-native"
 
-- 
1.7.4.1

Re: [PATCH 0/2] Add MACHINEOVERRIDES variable to bitbake.conf

[Saul Wold]

On 05/13/2011 11:45 AM, Khem Raj wrote:
>
>
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
>    Branch: kraj/misc-fixes
>    Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes
>
> Thanks,
>      Khem Raj<raj.khem@gmail.com>
> ---
>
>
> Khem Raj (2):
>    conf/bitbake.conf: Add MACHINEOVERRIDES variable
>    util-linux: inherit pkgconfig
>
>   meta/conf/bitbake.conf                      |    3 ++-
>   meta/recipes-core/util-linux/util-linux.inc |    2 +-
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
Merged into oe-core

Thanks	
	Sau!