aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-01-15 10:41:51 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-17 11:30:21 +0000
commitca46c09d38b766b69f485f1e82fc78f2a5e6a4c8 (patch)
treec32a82f03c21d306f7855450ebc052552da5fc1d
parentf4ba23212c97fb8c3351a3cf981ee355ae2fc9b1 (diff)
downloadopenembedded-core-contrib-ca46c09d38b766b69f485f1e82fc78f2a5e6a4c8.tar.gz
openembedded-core-contrib-ca46c09d38b766b69f485f1e82fc78f2a5e6a4c8.tar.bz2
openembedded-core-contrib-ca46c09d38b766b69f485f1e82fc78f2a5e6a4c8.zip
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] Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/multiconfig/default.conf0
2 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 40efb959e66..c8516a800da 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 00000000000..e69de29bb2d
--- /dev/null
+++ b/meta/conf/multiconfig/default.conf