[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2983/8267] insane: display names instead of ELF machine numbers
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 2983/8267] insane: display names instead of ELF machine numbers
- Date: Sat, 16 Dec 2017 23:59:42 +0000 (UTC)
commit a003a929d009b5b360c5a050bd9d2b903df5acce
Author: Ross Burton <ross burton intel com>
Date: Tue Oct 11 13:19:44 2016 +0100
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.
(From OE-Core rev: 607a2a1de4b77818c3e801a4de7ff0888229e036)
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/classes/insane.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b347638..17c9284 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" % \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]