summaryrefslogtreecommitdiffstats
path: root/meta/classes/sanity.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-07 22:35:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-12 16:00:30 +0000
commit40b3030626d4383873aa7ea62152e79c6ec88f74 (patch)
treee669c8347281848000e37c6c5d281ccef50e0287 /meta/classes/sanity.bbclass
parent442e2e7da5fe5fe7097f8799a479f98d36e60ef3 (diff)
downloadpoky-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/classes/sanity.bbclass')
-rw-r--r--meta/classes/sanity.bbclass2
1 files changed, 1 insertions, 1 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