diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-07 22:35:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-12 16:00:20 +0000 |
| commit | b7279f99639774674da806d37d252f388f33055f (patch) | |
| tree | 2589e187ccdc32913035b8c68c69c4acabae4192 | |
| parent | 22465cef87b4b1685b3b131751eaf528503b264c (diff) | |
| download | openembedded-core-b7279f99639774674da806d37d252f388f33055f.tar.gz openembedded-core-b7279f99639774674da806d37d252f388f33055f.tar.bz2 openembedded-core-b7279f99639774674da806d37d252f388f33055f.zip | |
bitbake.conf: Default DISTRO to nodistro
An empty distro value leads to OVERRIDES and FILESOVERRIDES containing
"::" entries which causes odd issues such as files being included when
they shouldn't be. We could put in anonymous python to guard against
empty entries but its messy and setting a default value for DISTRO to
something harmless is much easier.
This patch adds a weak default and ensures the sanity test doesn't
complain about it.
DISTRO_VERSION and SDK_VERSION are also updated to match.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sanity.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index b8e5b02da0..83378b0573 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -599,7 +599,7 @@ def check_sanity_everybuild(status, d): # Check that the DISTRO is valid, if set # need to take into account DISTRO renaming DISTRO distro = d.getVar('DISTRO', True) - if distro: + if distro and distro != "nodistro": if not ( check_conf_exists("conf/distro/${DISTRO}.conf", d) or check_conf_exists("conf/distro/include/${DISTRO}.inc", d) ): status.addresult("DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % d.getVar("DISTRO", True)) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d7b7a4b46f..ea313adca5 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -656,6 +656,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" ### Config file processing ### +# An empty distro leads to :: entries in OVERRIDES and FILEOVERRIDES which +# is a bad idea. Setting a dummy value is better than a ton of anonymous python. +DISTRO ??= "nodistro" + # Overrides are processed left to right, so the ones that are named later take precedence. # You generally want them to go from least to most specific. # diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index d275525000..5ef9c32c39 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -43,8 +43,8 @@ NO32LIBS ??= "1" # Default to emitting logfiles if a build fails. BBINCLUDELOGS ??= "yes" -SDK_VERSION ??= "oe-core.0" -DISTRO_VERSION ??= "oe-core.0" +SDK_VERSION ??= "nodistro.0" +DISTRO_VERSION ??= "nodistro.0" # Missing checksums should raise an error BB_STRICT_CHECKSUM = "1" |