From 643058d5a59631e6644115c8b7355ca732f9c982 Mon Sep 17 00:00:00 2001
From: Christopher Clark <christopher.w.clark@gmail.com>
Date: Tue, 25 Feb 2020 16:15:45 -0800
Subject: seabios: upgrade to version 1.13.0 at official URI and switch to
 python3

Use native python3 for the build as python2 no longer available.
Official seabios release SRC_URI fixes QA warning about using GitHub archives.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-extended/seabios/seabios/python3.patch | 13 +++++++
 recipes-extended/seabios/seabios_1.11.2.bb     | 44 ------------------------
 recipes-extended/seabios/seabios_1.13.0.bb     | 47 ++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 44 deletions(-)
 create mode 100644 recipes-extended/seabios/seabios/python3.patch
 delete mode 100644 recipes-extended/seabios/seabios_1.11.2.bb
 create mode 100644 recipes-extended/seabios/seabios_1.13.0.bb

diff --git a/recipes-extended/seabios/seabios/python3.patch b/recipes-extended/seabios/seabios/python3.patch
new file mode 100644
index 00000000..a2786fd7
--- /dev/null
+++ b/recipes-extended/seabios/seabios/python3.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 516cb38..7f6acaa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ LD=$(CROSS_PREFIX)ld
+ OBJCOPY=$(CROSS_PREFIX)objcopy
+ OBJDUMP=$(CROSS_PREFIX)objdump
+ STRIP=$(CROSS_PREFIX)strip
+-PYTHON=python
++PYTHON=python3
+ CPP=$(CROSS_PREFIX)cpp
+ IASL:=iasl
+ LD32BIT_FLAG:=-melf_i386
diff --git a/recipes-extended/seabios/seabios_1.11.2.bb b/recipes-extended/seabios/seabios_1.11.2.bb
deleted file mode 100644
index 81eaec96..00000000
--- a/recipes-extended/seabios/seabios_1.11.2.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "SeaBIOS"
-HOMEPAGE = "http://www.coreboot.org/SeaBIOS"
-LICENSE = "LGPLv3"
-SECTION = "firmware"
-
-SRC_URI = " \
-    https://github.com/qemu/seabios/archive/rel-${PV}.tar.gz \
-    file://hostcc.patch \
-    "
-S = "${WORKDIR}/${PN}-rel-${PV}"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
-                    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6  \
-                    "
-
-SRC_URI[md5sum] = "3f78065837dbd8873513a1b7d5276e78"
-SRC_URI[sha256sum] = "73e73c8e406d97265782f6c942b3c1d178ed4f4afc9f381b22336c3968291693"
-
-FILES_${PN} = "/usr/share/firmware"
-
-DEPENDS = "util-linux-native file-native bison-native flex-native gettext-native acpica-native python-native"
-
-TUNE_CCARGS = ""
-EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
-EXTRA_OEMAKE += "CROSS_PREFIX=${TARGET_PREFIX}"
-
-COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
-
-do_configure() {
-    oe_runmake defconfig
-}
-
-do_compile() {
-    unset CPP
-    unset CPPFLAGS
-    oe_runmake
-}
-
-do_install() {
-    oe_runmake
-    install -d ${D}/usr/share/firmware
-    install -m 0644 out/bios.bin ${D}/usr/share/firmware/
-}
-
diff --git a/recipes-extended/seabios/seabios_1.13.0.bb b/recipes-extended/seabios/seabios_1.13.0.bb
new file mode 100644
index 00000000..4cf44201
--- /dev/null
+++ b/recipes-extended/seabios/seabios_1.13.0.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "SeaBIOS"
+HOMEPAGE = "http://www.coreboot.org/SeaBIOS"
+LICENSE = "LGPLv3"
+SECTION = "firmware"
+
+inherit python3native
+
+SRC_URI = " \
+    https://www.seabios.org/downloads/seabios-${PV}.tar.gz \
+    file://hostcc.patch \
+    file://python3.patch \
+    "
+S = "${WORKDIR}/${PN}-${PV}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
+                    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6  \
+                    "
+
+SRC_URI[md5sum] = "1dc1725bac1d230bfd6b3204eed4f2f7"
+SRC_URI[sha256sum] = "37673dc2d6308591b15bdb94e5bcc3e99bdb40198d2247733c43f50b55dbe703"
+
+FILES_${PN} = "/usr/share/firmware"
+
+DEPENDS += "util-linux-native file-native bison-native flex-native gettext-native acpica-native"
+
+TUNE_CCARGS = ""
+EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
+EXTRA_OEMAKE += "CROSS_PREFIX=${TARGET_PREFIX}"
+
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
+
+do_configure() {
+    oe_runmake defconfig
+}
+
+do_compile() {
+    unset CPP
+    unset CPPFLAGS
+    oe_runmake
+}
+
+do_install() {
+    oe_runmake
+    install -d ${D}/usr/share/firmware
+    install -m 0644 out/bios.bin ${D}/usr/share/firmware/
+}
+
-- 
cgit v1.2.3-54-g00ecf