From: Emil Kronborg <[email protected]> Commit cd25e5544ca3 ("insane: use HOST_ variables, not TARGET_ to determine the cross system") updated the variables themselves, but not their names. To prevent confusion, match the Python variable name to the BitBake variable name.
Signed-off-by: Emil Kronborg <[email protected]> Signed-off-by: Alexandre Belloni <[email protected]> (cherry picked from commit f5bebc96580ec74d10bc96b4265357ebc9bcd6ad) Signed-off-by: Steve Sakoman <[email protected]> --- meta/classes-global/insane.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 4eb8cb1397..bcc179fe26 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -334,12 +334,12 @@ def package_qa_check_arch(path,name,d, elf, messages): if not elf: return - target_os = d.getVar('HOST_OS') - target_arch = d.getVar('HOST_ARCH') + host_os = d.getVar('HOST_OS') + host_arch = d.getVar('HOST_ARCH') provides = d.getVar('PROVIDES') bpn = d.getVar('BPN') - if target_arch == "allarch": + if host_arch == "allarch": pn = d.getVar('PN') oe.qa.add_message(messages, "arch", pn + ": Recipe inherits the allarch class, but has packaged architecture-specific binaries") return @@ -351,12 +351,12 @@ def package_qa_check_arch(path,name,d, elf, messages): #if this will throw an exception, then fix the dict above (machine, osabi, abiversion, littleendian, bits) \ - = oe.elf.machine_dict(d)[target_os][target_arch] + = oe.elf.machine_dict(d)[host_os][host_arch] # Check the architecture and endiannes of the binary is_32 = (("virtual/kernel" in provides) or bb.data.inherits_class("module", d)) and \ - (target_os == "linux-gnux32" or target_os == "linux-muslx32" or \ - target_os == "linux-gnu_ilp32" or re.match(r'mips64.*32', d.getVar('DEFAULTTUNE'))) + (host_os == "linux-gnux32" or host_os == "linux-muslx32" or \ + host_os == "linux-gnu_ilp32" or re.match(r'mips64.*32', d.getVar('DEFAULTTUNE'))) is_bpf = (oe.qa.elf_machine_to_string(elf.machine()) == "BPF") if not ((machine == elf.machine()) or is_32 or is_bpf): oe.qa.add_message(messages, "arch", "Architecture did not match (%s, expected %s) in %s" % \ -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#202361): https://lists.openembedded.org/g/openembedded-core/message/202361 Mute This Topic: https://lists.openembedded.org/mt/107504040/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
