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/distro | |
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/distro')
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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" | |||
43 | 43 | ||
44 | # Default to emitting logfiles if a build fails. | 44 | # Default to emitting logfiles if a build fails. |
45 | BBINCLUDELOGS ??= "yes" | 45 | BBINCLUDELOGS ??= "yes" |
46 | SDK_VERSION ??= "oe-core.0" | 46 | SDK_VERSION ??= "nodistro.0" |
47 | DISTRO_VERSION ??= "oe-core.0" | 47 | DISTRO_VERSION ??= "nodistro.0" |
48 | 48 | ||
49 | # Missing checksums should raise an error | 49 | # Missing checksums should raise an error |
50 | BB_STRICT_CHECKSUM = "1" | 50 | BB_STRICT_CHECKSUM = "1" |