From 7fbd940e8934e08f9c1b4d28c320e50cb5c72adf Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Sun, 15 Jan 2017 10:41:51 -0800 Subject: bitbake.conf: require conf/multiconfig/${BB_CURRENT_MC}.conf Presently there is no check to verify the existence of configuration files as listed in BBMULTICONFIG. For example, BBMULTICONFIG = "foobar" in local.conf does not trigger an error or even a warning when there is no conf/multiconfig/foobar.conf. The missing file is silently ignored. This patch changes the inclusion of all multiconfig configuration files as a non-optional requirement. If the file is missing, we get an error such as: ERROR: ParseError at /data/master-multi/poky/meta/conf/bitbake.conf:704: Could not include required file conf/multiconfig/foobar.conf Although the "default" configuration is not listed in BBMULTICONFIG, this change also requires the file multiconfig/default.conf to exist. The "default" (non-multiconfig) configuration is normally configured via local.conf, so although this file is required, it can/should be empty. This patch creates an empty file default.conf in meta/conf/multiconfig. [YOCTO#10917] (From OE-Core rev: ca46c09d38b766b69f485f1e82fc78f2a5e6a4c8) Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- meta/conf/multiconfig/default.conf | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 meta/conf/multiconfig/default.conf diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 40efb959e6..c8516a800d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -701,7 +701,7 @@ require conf/abi_version.conf include conf/site.conf include conf/auto.conf include conf/local.conf -include conf/multiconfig/${BB_CURRENT_MC}.conf +require conf/multiconfig/${BB_CURRENT_MC}.conf include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf diff --git a/meta/conf/multiconfig/default.conf b/meta/conf/multiconfig/default.conf new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3-54-g00ecf