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>
This commit is contained in:
parent
442e2e7da5
commit
40b3030626
|
@ -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))
|
||||
|
||||
|
|
|
@ -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.
|
||||
#
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue