diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-07-28 19:07:57 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-01 14:16:56 +0100 |
| commit | 79e7c6854228fea6242332548373467dac43f634 (patch) | |
| tree | 2ec61a18337b576459cde1ac20353923eddf3e07 /meta/classes/sanity.bbclass | |
| parent | d774facc297065e81cd146fd378c655e9ce69b38 (diff) | |
| download | poky-79e7c6854228fea6242332548373467dac43f634.tar.gz | |
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 <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sanity.bbclass')
| -rw-r--r-- | meta/classes/sanity.bbclass | 10 |
1 files changed, 9 insertions, 1 deletions
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): | |||
| 375 | elif oeroot.find (' ') != -1: | 375 | elif oeroot.find (' ') != -1: |
| 376 | 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." | 376 | 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." |
| 377 | 377 | ||
| 378 | # Check that we don't have duplicate entries in PACKAGE_ARCHS | 378 | # Check that we don't have duplicate entries in PACKAGE_ARCHS & that TUNE_PKGARCH is in PACKAGE_ARCHS |
| 379 | pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True) | 379 | pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True) |
| 380 | tunepkg = data.getVar('TUNE_PKGARCH', e.data, True) | ||
| 381 | tunefound = False | ||
| 380 | seen = {} | 382 | seen = {} |
| 381 | dups = [] | 383 | dups = [] |
| 382 | 384 | ||
| @@ -385,9 +387,15 @@ def check_sanity(e): | |||
| 385 | dups.append(pa) | 387 | dups.append(pa) |
| 386 | else: | 388 | else: |
| 387 | seen[pa] = 1 | 389 | seen[pa] = 1 |
| 390 | if pa == tunepkg: | ||
| 391 | tunefound = True | ||
| 392 | |||
| 388 | if len(dups): | 393 | if len(dups): |
| 389 | messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups) | 394 | messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups) |
| 390 | 395 | ||
| 396 | if tunefound == False: | ||
| 397 | messages = messages + "Error, the PACKAGE_ARCHS variable does not contain TUNE_PKGARCH (%s)." % tunepkg | ||
| 398 | |||
| 391 | if messages != "": | 399 | if messages != "": |
| 392 | raise_sanity_error(messages) | 400 | raise_sanity_error(messages) |
| 393 | 401 | ||
