patch

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

Author: Valeriy Khorunzhin

images/qemu/patches/seabios/002-alt-skip-flags-when-parse-objdump-section.patch

@@ -0,0 +1,13 @@
+diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py
+index 6616721..4f655dc 100755
+--- a/scripts/layoutrom.py
++++ b/scripts/layoutrom.py
+@@ -564,7 +564,7 @@ def parseObjDump(file, fileid):
+ 
+         if state == 'section':
+             try:
+-                idx, name, size, vma, lma, fileoff, align = line.split()
++                idx, name, size, vma, lma, fileoff, align, *_flags = line.split()
+                 if align[:3] != '2**':
+                     continue
+                 section = Section()

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

@@ -1,5 +1,2 @@
 # 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/patches/seabios/README.md

@@ -35,7 +35,7 @@ shell:
     mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
     git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src/{{ $gitRepoName }}-{{ $version }}
 
-    echo "12"
+    echo "123"
 
     cd /src/{{ $gitRepoName }}-{{ $version }}
 
@@ -67,7 +67,7 @@ shell:
     echo "Apply SeaBIOS patches"
     for p in /patches/seabios/*.patch ; do
       [ -f "$p" ] || continue
-      git -C roms/seabios apply --check --ignore-space-change --ignore-whitespace "$p" >/dev/null 2>&1 || continue
+      git -C roms/seabios apply --check --ignore-space-change --ignore-whitespace "$p" >/dev/null 2>&1 || (echo "FAIL" ; exit 1)
       echo -n "Apply ${p} to roms/seabios ... "
       git -C roms/seabios apply --ignore-space-change --ignore-whitespace "$p" && echo OK || (echo FAIL ; exit 1)
     done