import seabios-1.14.0-1.module+el8.6.0+12861+13975d62

.gitignore

@@ -1 +1 @@
-SOURCES/seabios-1.13.0.tar.gz
+SOURCES/seabios-1.14.0.tar.gz

.seabios.metadata

@@ -1 +1 @@
-62918d1657e4046eb82ecf426988f5feb6c318de SOURCES/seabios-1.13.0.tar.gz
+61be3265b3d98f66cefe43569ab3870f53c7e2ea SOURCES/seabios-1.14.0.tar.gz

SOURCES/0002-allow-1TB-of-RAM.patch

@@ -1,4 +1,4 @@
-From 54157a3e683d10137a80d2ac85a6aacfaa3f4020 Mon Sep 17 00:00:00 2001
+From 92889386425bab008397e6a48ab922d635b495f6 Mon Sep 17 00:00:00 2001
 From: Andrea Arcangeli <aarcange@redhat.com>
 Date: Tue, 8 Oct 2013 17:07:23 +0200
 Subject: allow >1TB of RAM
@@ -28,10 +28,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c
-index 4fcd8f5..d1d01fa 100644
+index fba4e52..090d655 100644
 --- a/src/fw/paravirt.c
 +++ b/src/fw/paravirt.c
-@@ -495,9 +495,10 @@ qemu_cfg_e820(void)
+@@ -516,9 +516,10 @@ qemu_cfg_e820(void)
      }
  
      // Check for memory over 4Gig in cmos

SOURCES/0003-smbios-set-bios-vendor-version-fields-to-Seabios-0.5.patch

@@ -1,4 +1,4 @@
-From e65a8cab8ed866690d1a229e97c1e8ee0369cd72 Mon Sep 17 00:00:00 2001
+From f82eb7cc578ec3496a05c435bdf6b571ec92d07a Mon Sep 17 00:00:00 2001
 From: Gerd Hoffmann <kraxel@redhat.com>
 Date: Mon, 28 Jul 2014 12:14:11 +0200
 Subject: smbios: set bios vendor/version fields to Seabios/0.5.1

SOURCES/0004-Workaround-for-a-win8.1-32-S4-resume-bug.patch

@@ -1,4 +1,4 @@
-From 5c71a5876270b2dc0173db9ba410aa202f002428 Mon Sep 17 00:00:00 2001
+From e947600eec4921f473c4d087dfb2a2c39684dd77 Mon Sep 17 00:00:00 2001
 From: Radim Krcmar <rkrcmar@redhat.com>
 Date: Mon, 10 Mar 2014 15:14:27 +0100
 Subject: Workaround for a win8.1-32 S4 resume bug

SOURCES/0005-redhat-reserve-more-memory-on-fseg.patch

@@ -1,4 +1,4 @@
-From 7efcff8f5b02a721a11e13423a2938affa4eff18 Mon Sep 17 00:00:00 2001
+From 798141f00f5c184da5fd096cb1da32706628e890 Mon Sep 17 00:00:00 2001
 From: Gerd Hoffmann <kraxel@redhat.com>
 Date: Tue, 19 Apr 2016 11:27:50 +0200
 Subject: redhat: reserve more memory on fseg

SOURCES/seabios-vga-fix-cirrus-bios.patch

@@ -1,42 +0,0 @@
-From 9e3aaa8c60399e1a66f4700b34698ef4cc59c773 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Thu, 2 Jul 2020 16:33:09 -0400
-Subject: [PATCH] vga: fix cirrus bios
-
-RH-Author: Gerd Hoffmann <kraxel@redhat.com>
-Message-id: <20200702163309.29589-2-kraxel@redhat.com>
-Patchwork-id: 97895
-O-Subject: [RHEL-AV-8.2.1 seabios PATCH 1/1] vga: fix cirrus bios
-Bugzilla: 1847959
-RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
-RH-Acked-by: Juan Quintela <quintela@redhat.com>
-RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-
-Little mistake, big effect.  The patch adding the ati driver broke
-cirrus due to a missing "else", which effectively downgrades cirrus
-to standard vga.
-
-Fixes: 34b6ecc16074 ("vga: add atiext driver")
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-(cherry picked from commit d11c75185276ded944f2ea0277532b7fee849bbc)
-Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
----
- vgasrc/vgahw.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h
-index c774f4f2..8b64660e 100644
---- a/vgasrc/vgahw.h
-+++ b/vgasrc/vgahw.h
-@@ -36,7 +36,7 @@ static inline int vgahw_set_mode(struct vgamode_s *vmode_g, int flags) {
- static inline void vgahw_list_modes(u16 seg, u16 *dest, u16 *last) {
-     if (CONFIG_VGA_CIRRUS)
-         clext_list_modes(seg, dest, last);
--    if (CONFIG_VGA_ATI)
-+    else if (CONFIG_VGA_ATI)
-         ati_list_modes(seg, dest, last);
-     else if (CONFIG_VGA_BOCHS)
-         bochsvga_list_modes(seg, dest, last);
--- 
-2.27.0
-

SPECS/seabios.spec

@@ -1,13 +1,13 @@
 Name:           seabios
-Version:        1.13.0
+Version:        1.14.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Open-source legacy BIOS implementation
 
 Group:          Applications/Emulators
 License:        LGPLv3
 URL:            https://www.coreboot.org/SeaBIOS
 
-Source0:        https://code.coreboot.org/p/seabios/downloads/get/seabios-1.13.0.tar.gz
+Source0:        https://code.coreboot.org/p/seabios/downloads/get/seabios-1.14.0.tar.gz
 
 Source10:       config.vga.cirrus
 Source11:       config.vga.qxl
@@ -23,8 +23,6 @@ Patch0002: 0002-allow-1TB-of-RAM.patch
 Patch0003: 0003-smbios-set-bios-vendor-version-fields-to-Seabios-0.5.patch
 Patch0004: 0004-Workaround-for-a-win8.1-32-S4-resume-bug.patch
 Patch0005: 0005-redhat-reserve-more-memory-on-fseg.patch
-# For bz#1847959 - novnc working in grayscale and low resolution after upgrade to OSP15/OSP16
-Patch6: seabios-vga-fix-cirrus-bios.patch
 
 BuildRequires: python3 iasl
 ExclusiveArch: x86_64 %{power64}
@@ -80,7 +78,6 @@ SeaVGABIOS is an open-source VGABIOS implementation.
 %patch0003 -p1
 %patch0004 -p1
 %patch0005 -p1
-%patch6 -p1
 
 %build
 %ifarch x86_64
@@ -139,6 +136,10 @@ install -m 0644 binaries/vgabios*.bin $RPM_BUILD_ROOT%{_datadir}/seavgabios
 
 
 %changelog
+* Thu Sep 2 2021 Danilo C. L. de Paula <ddepaula@redhat.com> - 1.14.0-1.fc34
+- Resolves: bz#2000225
+  (Rebase virt:rhel module:stream based on AV-8.6)
+
 * Mon Jul 13 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 1.13.0
 - Resolves: bz#1844296
 (Upgrade components in virt:rhel module:stream for RHEL-8.3 release)