summaryrefslogtreecommitdiffstats
path: root/meta
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:31:36 +0000
commit7fbd940e8934e08f9c1b4d28c320e50cb5c72adf (patch)
treec39f2120fd6c2677a3977f275885adf0b10b1ccc /meta
parentbad00064ef04d0ccc382ff663e7cfaf9a01e5545 (diff)
downloadpoky-7fbd940e8934e08f9c1b4d28c320e50cb5c72adf.tar.gz
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 <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 40efb959e6..c8516a800d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -701,7 +701,7 @@ require conf/abi_version.conf
701include conf/site.conf 701include conf/site.conf
702include conf/auto.conf 702include conf/auto.conf
703include conf/local.conf 703include conf/local.conf
704include conf/multiconfig/${BB_CURRENT_MC}.conf 704require conf/multiconfig/${BB_CURRENT_MC}.conf
705include conf/build/${BUILD_SYS}.conf 705include conf/build/${BUILD_SYS}.conf
706include conf/target/${TARGET_SYS}.conf 706include conf/target/${TARGET_SYS}.conf
707include conf/machine/${MACHINE}.conf 707include 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
--- /dev/null
+++ b/meta/conf/multiconfig/default.conf