[OE-core] [PATCH 2/4] sanity.bbclass: re-enable DISTRO check
Paul Eggleton
paul.eggleton at linux.intel.com
Wed Sep 7 16:05:40 UTC 2011
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 <paul.eggleton at linux.intel.com>
---
meta/classes/sanity.bbclass | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 44b0688..93008cc 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 = ""
--
1.7.4.1
More information about the Openembedded-core
mailing list