Skip to contentSkip to conversation

init-ifupdown: always make machine-specific

PATCH In review Ross Burton 2 participants 3 messages Jul 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 init-ifupdown: always make machine-specific

From: Ross Burton <[email protected]>

We make this recipe machine-specific for all qemu targets, but otherwise defaults to tune-specific.

However the network configuration is typically machine-specific, so do this in the recipe directly so that BSPs don't need to do it themselves.

---
 meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +1 -1
index 733ae41f20..b6fc8a4d41 100644
@@ -34,7 +34,7 @@ do_install_append_qemuall () {
 	touch ${D}${sysconfdir}/network/nm-disabled-eth0
 }
 
-PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 RDEPENDS_${PN} = "netbase"
 RCONFLICTS_${PN} = "netbase (< 1:5.0)"
 
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/2 insane: improve arch test messages

From: Ross Burton <[email protected]>

The messages from the ELF 'arch' test are not obvious, clarify the messages and prune output paths.

---
 meta/classes/insane.bbclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta/classes/insane.bbclass +6 -6
index 89a516882b..ee19ef673e 100644
@@ -364,14 +364,14 @@ def package_qa_check_arch(path,name,d, elf, messages):
             target_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):
-        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)))
+        package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) in %s" % \
+                 (oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path, d, name)))
     elif not ((bits == elf.abiSize()) or is_32 or is_bpf):
-        package_qa_add_message(messages, "arch", "Bit size did not match (%d to %d) %s on %s" % \
-                 (bits, elf.abiSize(), bpn, package_qa_clean_path(path,d)))
+        package_qa_add_message(messages, "arch", "Bit size did not match (%d, expected %d) in %s" % \
+                 (elf.abiSize(), bits, package_qa_clean_path(path, d, name)))
     elif not ((littleendian == elf.isLittleEndian()) or is_bpf):
-        package_qa_add_message(messages, "arch", "Endiannes did not match (%d to %d) on %s" % \
-                 (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d)))
+        package_qa_add_message(messages, "arch", "Endiannes did not match (%d, expected %d) in %s" % \
+                 (elf.isLittleEndian(), littleendian, package_qa_clean_path(path,d, name)))
 
 QAPATHTEST[desktop] = "package_qa_check_desktop"
 def package_qa_check_desktop(path, name, d, elf, messages):
Signature · 1 line
2.26.2
#2 lore raw

Re: [OE-core] [PATCH 2/2] insane: improve arch test messages

Quoted 15 lines · Ross Burton

From: Ross Burton <[email protected]>

The messages from the ELF 'arch' test are not obvious, clarify the messages and prune output paths.

---
 meta/classes/insane.bbclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta/classes/insane.bbclass +0 -0
index 89a516882b..ee19ef673e 100644

meta/classes/insane.bbclass def package_qa_check_arch(path,name,d, elf, messages): · line 367

Quoted 6 lines
meta/classes/insane.bbclass +1 -2
@@ -364,14 +364,14 @@ def package_qa_check_arch(path,name,d, elf, messages):
             target_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):
-        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)))
+        package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) in %s" % \

Should this be called CPU architecture as well.

meta/classes/insane.bbclass def package_qa_check_arch(path,name,d, elf, messages): · line 370

Quoted 5 lines
meta/classes/insane.bbclass +2 -2
+                 (oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path, d, name)))
     elif not ((bits == elf.abiSize()) or is_32 or is_bpf):
-        package_qa_add_message(messages, "arch", "Bit size did not match (%d to %d) %s on %s" % \
-                 (bits, elf.abiSize(), bpn, package_qa_clean_path(path,d)))
+        package_qa_add_message(messages, "arch", "Bit size did not match (%d, expected %d) in %s" % \

Bit size perhaps should be called Word size to use more familiar term for this.

meta/classes/insane.bbclass def package_qa_check_arch(path,name,d, elf, messages): · line 373

Quoted 5 lines
meta/classes/insane.bbclass +2 -2
+                 (elf.abiSize(), bits, package_qa_clean_path(path, d, name)))
     elif not ((littleendian == elf.isLittleEndian()) or is_bpf):
-        package_qa_add_message(messages, "arch", "Endiannes did not match (%d to %d) on %s" % \
-                 (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d)))
+        package_qa_add_message(messages, "arch", "Endiannes did not match (%d, expected %d) in %s" % \

typo, it should be Endianness

Quoted 8 lines
meta/classes/insane.bbclass +1 -0
+                 (elf.isLittleEndian(), littleendian, package_qa_clean_path(path,d, name)))
 
 QAPATHTEST[desktop] = "package_qa_check_desktop"
 def package_qa_check_desktop(path, name, d, elf, messages):