From 79e7c6854228fea6242332548373467dac43f634 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 28 Jul 2011 19:07:57 -0500 Subject: sanity.bbclass: Add sanity check that TUNE_PKGARCH appears in PACKAGE_ARCHS Its possible we get duplications if we explicity add TUNE_PKGARCH to PACKAGE_ARCHS so instead just add a sanity check to verify it. (From OE-Core rev: b2ae0444eb1984b86c02e571bb1efeaacdeafcf1) Signed-off-by: Kumar Gala Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index b054146bd1..999e15dafd 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -375,8 +375,10 @@ def check_sanity(e): elif oeroot.find (' ') != -1: messages = messages + "Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space." - # Check that we don't have duplicate entries in PACKAGE_ARCHS + # Check that we don't have duplicate entries in PACKAGE_ARCHS & that TUNE_PKGARCH is in PACKAGE_ARCHS pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True) + tunepkg = data.getVar('TUNE_PKGARCH', e.data, True) + tunefound = False seen = {} dups = [] @@ -385,9 +387,15 @@ def check_sanity(e): dups.append(pa) else: seen[pa] = 1 + if pa == tunepkg: + tunefound = True + if len(dups): messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups) + if tunefound == False: + messages = messages + "Error, the PACKAGE_ARCHS variable does not contain TUNE_PKGARCH (%s)." % tunepkg + if messages != "": raise_sanity_error(messages) -- cgit v1.2.3-54-g00ecf