pppatch

Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>

Author: Valeriy Khorunzhin

images/qemu/patches/seabios/002-layoutrom-handle-missing-sections.patch

@@ -0,0 +1,46 @@
+diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py
+index dd2c9ef..f09ec55 100644
+--- a/scripts/layoutrom.py
++++ b/scripts/layoutrom.py
+@@ -460,13 +460,18 @@ def findReachable(anchorsections, checkreloc, data):
+ def findReachable(anchorsections, checkreloc, data):
+     anchorsections = dict([(section, []) for section in anchorsections])
+     pending = list(anchorsections)
+     while pending:
+         section = pending.pop()
++        if section is None or section.relocs is None:
++            continue
+         for reloc in section.relocs:
+             chain = anchorsections[section] + [section.name]
+             if not checkreloc(reloc, section, data, chain):
+                 continue
+             nextsection = reloc.symbol.section
++            if nextsection is None:
++                continue
+             if nextsection not in anchorsections:
+                 anchorsections[nextsection] = chain
+                 pending.append(nextsection)
+     return anchorsections
+@@ -555,7 +560,10 @@ def parseObjDump(file, fileid):
+             state = None
+             continue
+         state = 'reloc'
+-        relocsection = sectionmap[sectionname]
++        relocsection = sectionmap.get(sectionname)
++        if relocsection is None:
++            state = None
++            continue
+         continue
+ 
+     if state == 'section':
+@@ -660,10 +668,11 @@ else:
+     entrysym = symbols['16'].get('entry_csm')
+ else:
+     entrysym = symbols['16'].get('reset_vector')
+-anchorsections = [entrysym.section] + [
++anchorsections = [entrysym.section] + [
+     section for section in allsections
+     if section.name.startswith('.fixedaddr.')]
++anchorsections = [section for section in anchorsections if section is not None]
+ keepsections = findReachable(anchorsections, checkKeep, symbols)
+ sections = [section for section in allsections if section in keepsections]

images/qemu/patches/seabios/README.md

@@ -1,2 +1,5 @@
 # 001-isa-debug-port-no-bootable-device-message.patch
 If SeaBIOS cannot find a bootable device, output "No bootable device." to the debug device at address 0x403 in addition to the normal console message.
+
+# 002-layoutrom-handle-missing-sections.patch
+Teach `layoutrom.py` to skip relocations and anchor sections that are absent in `objdump` output from newer toolchains so `make -C roms bios` can finish successfully.

images/qemu/werf.inc.yaml

@@ -364,36 +364,6 @@ shell:
     echo "Building patched SeaBIOS..."
     ln -sf /usr/bin/python3 /usr/bin/python
 
-    python3 - <<'PY'
-    from pathlib import Path
-
-    p = Path("roms/seabios/scripts/layoutrom.py")
-    t = p.read_text()
-
-    replacements = {
-        "relocsection = sectionmap[sectionname]": """relocsection = sectionmap.get(sectionname)
-            if relocsection is None:
-                state = None
-                continue""",
-        "    pending = list(anchorsections)": "    pending = [section for section in anchorsections if section is not None]",
-        "        for reloc in section.relocs:": """        if section is None or section.relocs is None:
-            continue
-        for reloc in section.relocs:""",
-        "            if nextsection not in anchorsections:": """            if nextsection is None:
-                continue
-            if nextsection not in anchorsections:""",
-        "    keepsections = findReachable(anchorsections, checkKeep, symbols)": """    anchorsections = [section for section in anchorsections if section is not None]
-    keepsections = findReachable(anchorsections, checkKeep, symbols)""",
-    }
-
-    for old, new in replacements.items():
-        if old not in t:
-            raise SystemExit(f"Expected snippet not found in {p}: {old!r}")
-        t = t.replace(old, new, 1)
-
-    p.write_text(t)
-    PY
-
     make -C roms bios -j$(nproc)
 
     /install-qemu.sh --version-num "{{ $version }}" \