summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsweeaun <swee.aun.khor@intel.com>2017-07-05 16:56:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-08 13:34:45 +0100
commitf33627f30bf8924af0fb71f5a0f9f8cd86c8876a (patch)
treeca72e3e5289af694d53fb8618bca1050eb9f2fba
parent4f93b8528b4f35d8a3f30c5bbb194d52d9e1c0d3 (diff)
downloadpoky-f33627f30bf8924af0fb71f5a0f9f8cd86c8876a.tar.gz
insane.bbclass: Support musl-x32
Added musl-x32 elf header into dictionary. (From OE-Core rev: 305e2b3b3de1af0001d534e5c9ec126481dfd9dd) Signed-off-by: sweeaun <swee.aun.khor@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 7680a59d64..479d39c67e 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -150,6 +150,9 @@ def package_qa_get_machine_dict(d):
150 "linux-gnux32" : { 150 "linux-gnux32" : {
151 "x86_64": (62, 0, 0, True, 32), 151 "x86_64": (62, 0, 0, True, 32),
152 }, 152 },
153 "linux-muslx32" : {
154 "x86_64": (62, 0, 0, True, 32),
155 },
153 "linux-gnun32" : { 156 "linux-gnun32" : {
154 "mips64": ( 8, 0, 0, False, 32), 157 "mips64": ( 8, 0, 0, False, 32),
155 "mips64el": ( 8, 0, 0, True, 32), 158 "mips64el": ( 8, 0, 0, True, 32),
@@ -488,7 +491,7 @@ def package_qa_check_arch(path,name,d, elf, messages):
488 491
489 # Check the architecture and endiannes of the binary 492 # Check the architecture and endiannes of the binary
490 is_32 = (("virtual/kernel" in provides) or bb.data.inherits_class("module", d)) and \ 493 is_32 = (("virtual/kernel" in provides) or bb.data.inherits_class("module", d)) and \
491 (target_os == "linux-gnux32" or re.match('mips64.*32', d.getVar('DEFAULTTUNE'))) 494 (target_os == "linux-gnux32" or target_os == "linux-muslx32" or re.match('mips64.*32', d.getVar('DEFAULTTUNE')))
492 if not ((machine == elf.machine()) or is_32): 495 if not ((machine == elf.machine()) or is_32):
493 package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) on %s" % \ 496 package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) on %s" % \
494 (oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path,d))) 497 (oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path,d)))