Add MACHINEOVERRIDES variable to bitbake.conf

PATCH Applied Khem Raj 2 participants 4 messages May 13, 2011 – May 17, 2011

Share & tools

Khem Raj

author

2011-05-13 18:48 UTC #0 lore raw

cover Add MACHINEOVERRIDES variable to bitbake.conf

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 <[email protected]>
---

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

Signature · 1 line

1.7.4.1

Khem Raj

author

2011-05-13 18:48 UTC #1 lore raw

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

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 <[email protected]>

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

meta/conf/bitbake.conf +2 -1

index 7c72de1..8b6236e 100644
@@ -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"

Signature · 1 line

1.7.4.1

Khem Raj

author

2011-05-13 18:48 UTC #2 lore raw

PATCH 2/2 util-linux: inherit pkgconfig

In reply to 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 <[email protected]>

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

meta/recipes-core/util-linux/util-linux.inc +1 -1

index 447e5b7..489ec1a 100644
@@ -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"

Signature · 1 line

1.7.4.1

Saul Wold

Applied

2011-05-17 18:34 UTC #3 lore raw

In reply to Khem Raj

Quoted 11 lines · 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<[email protected]>
---

Quoted 8 lines

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!