summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-10-11 13:19:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-11 22:17:48 +0100
commit607a2a1de4b77818c3e801a4de7ff0888229e036 (patch)
treededc4544f9a38ee157e165a95d0ea96e84192b36
parent72336003741fb16a7ecdd6b753eae56310413ff7 (diff)
downloadopenembedded-core-contrib-607a2a1de4b77818c3e801a4de7ff0888229e036.tar.gz
openembedded-core-contrib-607a2a1de4b77818c3e801a4de7ff0888229e036.tar.bz2
openembedded-core-contrib-607a2a1de4b77818c3e801a4de7ff0888229e036.zip
insane: display names instead of ELF machine numbers
The 'arch' QA test currently simply outputs the ELF machine field as a number which isn't helpful. Display this as a human-readable name to make it clearer to the user what the problem is. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b347638d72..17c9284391 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -543,8 +543,8 @@ def package_qa_check_arch(path,name,d, elf, messages):
# Check the architecture and endiannes of the binary
if not ((machine == elf.machine()) or \
((("virtual/kernel" in provides) or bb.data.inherits_class("module", d) ) and (target_os == "linux-gnux32" or target_os == "linux-gnun32"))):
- package_qa_add_message(messages, "arch", "Architecture did not match (%d to %d) on %s" % \
- (machine, elf.machine(), package_qa_clean_path(path,d)))
+ package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) on %s" % \
+ (oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path,d)))
elif not ((bits == elf.abiSize()) or \
((("virtual/kernel" in provides) or bb.data.inherits_class("module", d) ) and (target_os == "linux-gnux32" or target_os == "linux-gnun32"))):
package_qa_add_message(messages, "arch", "Bit size did not match (%d to %d) %s on %s" % \