Bitbake is about to change the default value of this from "default" to "". The
original reason for this was to make this kind of include file usage easier.
Instead we were going to complicate bitbake code having to map one value into
the other.
Instead, stop using "default" and put a slightly horrible bit of code in
bitbake.conf
as an alternative.
This means a "default.conf" in the multiconfig directory will stop working but
this
was never something anyone was expected to use.
The eSDK code also needs updating for this change.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
meta/classes-recipe/populate_sdk_ext.bbclass | 2 +-
meta/conf/bitbake.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass
b/meta/classes-recipe/populate_sdk_ext.bbclass
index 3019dad0f3b..de4799f013b 100644
--- a/meta/classes-recipe/populate_sdk_ext.bbclass
+++ b/meta/classes-recipe/populate_sdk_ext.bbclass
@@ -768,7 +768,7 @@ fakeroot python do_populate_sdk_ext() {
# FIXME hopefully we can remove this restriction at some point, but the
eSDK
# can only be built for the primary (default) multiconfig
- if d.getVar('BB_CURRENT_MC') != 'default':
+ if d.getVar('BB_CURRENT_MC') != '':
bb.fatal('The extensible SDK can currently only be built for the
default multiconfig. Currently trying to build for %s.' %
d.getVar('BB_CURRENT_MC'))
# eSDK dependencies don't use the traditional variables and things don't
work properly if they are set
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ba7817b7e5e..8b607088c6e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -832,7 +832,7 @@ OE_FRAGMENTS_PREFIX ?= "conf/fragments"
OE_FRAGMENTS_METADATA_VARS ?= "BB_CONF_FRAGMENT_SUMMARY
BB_CONF_FRAGMENT_DESCRIPTION"
addfragments ${OE_FRAGMENTS_PREFIX} OE_FRAGMENTS OE_FRAGMENTS_METADATA_VARS
-require conf/multiconfig/${BB_CURRENT_MC}.conf
+require ${@"conf/multiconfig/${BB_CURRENT_MC}.conf" if "${BB_CURRENT_MC}" !=
"" else ""}
include conf/machine/${MACHINE}.conf
include conf/machine-sdk/${SDKMACHINE}.conf
require conf/cve-check-map.conf
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#210259):
https://lists.openembedded.org/g/openembedded-core/message/210259
Mute This Topic: https://lists.openembedded.org/mt/110805680/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
