diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-05-29 17:27:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-02 12:50:25 +0000 |
commit | 87f74cae704d9659437bdfcde6ca31018534c73f (patch) | |
tree | 1aeb0cd88b7b597075753228e9626ae65feb2933 /meta/conf | |
parent | 8ae3f2293f4bd60182d8a710af68c52f1610c665 (diff) | |
download | poky-87f74cae704d9659437bdfcde6ca31018534c73f.tar.gz |
bitbake.conf: set a default for MACHINE_FEATURES
Ensure that if MACHINE_FEATURES is not set by the machine config that we
don't end up with expansion errors during parsing. Technically since the
introduction of MACHINE_FEATURES_BACKFILL = "rtc" this is unlikely to be
a problem unless "rtc" is also added to
MACHINE_FEATURES_BACKFILL_CONSIDERED, however we should be consistent
with DISTRO_FEATURES which is defaulted in bitbake.conf.
(From OE-Core rev: bf2c8946d96524aaa91ab43762c963ea38ccc342)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 6675bffe57..ad1225b3c8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -707,6 +707,7 @@ OES_BITBAKE_CONF = "1" | |||
707 | # Machine properties and packagegroup-base stuff | 707 | # Machine properties and packagegroup-base stuff |
708 | ################################################################## | 708 | ################################################################## |
709 | 709 | ||
710 | MACHINE_FEATURES ?= "" | ||
710 | DISTRO_FEATURES ?= "" | 711 | DISTRO_FEATURES ?= "" |
711 | 712 | ||
712 | DISTRO_EXTRA_RDEPENDS ?= "" | 713 | DISTRO_EXTRA_RDEPENDS ?= "" |