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:30 +0000 |
commit | 40b3030626d4383873aa7ea62152e79c6ec88f74 (patch) | |
tree | e669c8347281848000e37c6c5d281ccef50e0287 /meta/conf/bitbake.conf | |
parent | 442e2e7da5fe5fe7097f8799a479f98d36e60ef3 (diff) | |
download | poky-40b3030626d4383873aa7ea62152e79c6ec88f74.tar.gz |
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.
(From OE-Core rev: b7279f99639774674da806d37d252f388f33055f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 4 |
1 files changed, 4 insertions, 0 deletions
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}" | |||
656 | ### Config file processing | 656 | ### Config file processing |
657 | ### | 657 | ### |
658 | 658 | ||
659 | # An empty distro leads to :: entries in OVERRIDES and FILEOVERRIDES which | ||
660 | # is a bad idea. Setting a dummy value is better than a ton of anonymous python. | ||
661 | DISTRO ??= "nodistro" | ||
662 | |||
659 | # Overrides are processed left to right, so the ones that are named later take precedence. | 663 | # Overrides are processed left to right, so the ones that are named later take precedence. |
660 | # You generally want them to go from least to most specific. | 664 | # You generally want them to go from least to most specific. |
661 | # | 665 | # |