From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Feb 2007 11:36:51 +0000 (+0000)
Subject: insane.bbclass: we really don't want packages with the wrong architecture, so do... 
X-Git-Tag: Release-2010-05/1~9198
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fe797b41116ef91d5ec66ba90bb5e4ca1874ac9;p=openembedded.git

insane.bbclass: we really don't want packages with the wrong architecture, so do bb.fatal instead if bb.error
symptom:
ERROR: Architecture did not match (20 to 3) on /work/ppc603e-angstrom-linux/udev-092-r15/install/udev/sbin/scsi_id
This means OE detected type 3 (i386) while it expected type 20 (powerpc), most likely caused by some fool hardcoding 'gcc' as compiler
---

diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 58f9ab54dd..6e8c90a706 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -246,7 +246,7 @@ def package_qa_check_arch(path,name,d):
     target_os   = bb.data.getVar('TARGET_OS',   d, True)
     target_arch = bb.data.getVar('TARGET_ARCH', d, True)
 
-    #this will throw an exception, then fix the dict above
+    #if this will throw an exception, then fix the dict above
     (machine, osabi, abiversion, littleendian) = package_qa_get_machine_dict()[target_os][target_arch]
     elf = package_qa_get_elf(path)
     try:
@@ -257,7 +257,7 @@ def package_qa_check_arch(path,name,d):
 
     sane = True
     if not machine == elf.machine():
-        bb.error("Architecture did not match (%d to %d) on %s" %(machine, elf.machine(), package_qa_clean_path(path,d)))
+        bb.fatal("Architecture did not match (%d to %d) on %s" %(machine, elf.machine(), package_qa_clean_path(path,d)))
         sane = package_qa_make_fatal_error( 4, name, path, d )
     elif not osabi == elf.osAbi():
         bb.error("OSABI did not match (%d to %d) on %s" % (osabi, elf.osAbi(), package_qa_clean_path(path,d)))