[OE-core] [PATCH] bitbake.conf: require conf/multiconfig/${BB_CURRENT_MC}.conf

[Andreas Müller]

On Sun, Jan 15, 2017 at 7:41 PM, Juro Bystricky
<juro.bystricky at intel.com> wrote:
> 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 at intel.com>
> ---
>  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 40efb95..c8516a8 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 0000000..e69de29
> --
> 2.7.4
>
This makes multiconfig mandatory for me:

| ERROR: ParseError at
/home/superandy/oe-core/sources/openembedded-core/meta/conf/bitbake.conf:704:
Could not include required file conf/multiconfig/${BB_CURRENT_MC}.conf

What am I missing - e.g bitbake update?

Andreas