summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/conf/distro/include/default-distrovars.inc4
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):
599 # Check that the DISTRO is valid, if set 599 # Check that the DISTRO is valid, if set
600 # need to take into account DISTRO renaming DISTRO 600 # need to take into account DISTRO renaming DISTRO
601 distro = d.getVar('DISTRO', True) 601 distro = d.getVar('DISTRO', True)
602 if distro: 602 if distro and distro != "nodistro":
603 if not ( check_conf_exists("conf/distro/${DISTRO}.conf", d) or check_conf_exists("conf/distro/include/${DISTRO}.inc", d) ): 603 if not ( check_conf_exists("conf/distro/${DISTRO}.conf", d) or check_conf_exists("conf/distro/include/${DISTRO}.inc", d) ):
604 status.addresult("DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % d.getVar("DISTRO", True)) 604 status.addresult("DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % d.getVar("DISTRO", True))
605 605
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.
661DISTRO ??= "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#
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.
45BBINCLUDELOGS ??= "yes" 45BBINCLUDELOGS ??= "yes"
46SDK_VERSION ??= "oe-core.0" 46SDK_VERSION ??= "nodistro.0"
47DISTRO_VERSION ??= "oe-core.0" 47DISTRO_VERSION ??= "nodistro.0"
48 48
49# Missing checksums should raise an error 49# Missing checksums should raise an error
50BB_STRICT_CHECKSUM = "1" 50BB_STRICT_CHECKSUM = "1"