From 895aa6b8ee9636a9f9d716c62c0adf951e1ff138 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 7 Sep 2011 17:05:40 +0100 Subject: sanity.bbclass: re-enable DISTRO check If DISTRO has been specified, ensure it is valid. (Unset or empty string is valid for DISTRO in OE-core by the use of defaultsetup.conf.) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 44b06880ad..93008cc685 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -269,10 +269,12 @@ def check_sanity(e): if os.path.exists(dldir) and not os.access(dldir, os.W_OK): messages = messages + "DL_DIR: %s exists but you do not appear to have write access to it. \n" % dldir - # Check that the DISTRO is valid + # Check that the DISTRO is valid, if set # need to take into account DISTRO renaming DISTRO - #if not ( check_conf_exists("conf/distro/${DISTRO}.conf", e.data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", e.data) ): - # messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", e.data, True ) + distro = data.getVar('DISTRO', e.data, True) + if distro: + if not ( check_conf_exists("conf/distro/${DISTRO}.conf", e.data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", e.data) ): + messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", e.data, True ) missing = "" -- cgit 1.2.3-korg