From b7279f99639774674da806d37d252f388f33055f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 7 Nov 2013 22:35:07 +0000 Subject: 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. Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/conf/bitbake.conf') 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}" ### 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. # -- cgit 1.2.3-korg