From 9ba0ec9b13e19f3d9bf9f2cbbde46588d251b8f5 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 10 Feb 2021 12:26:32 +0100 Subject: [PATCH] * Wed Feb 10 2021 Miroslav Rezanina - 1.14.0-3 - Update to include in RHEL 9 compose - Resolves: rhbz#1926095 (qemu-kvm not available for ppc64le) --- ...around-for-a-win8.1-32-S4-resume-bug.patch | 14 +----- ...3-redhat-reserve-more-memory-on-fseg.patch | 4 +- ...video-modes-to-work-around-a-Windows.patch | 8 +++- config.coreboot | 2 - config.csm | 2 - config.seabios-microvm | 26 ----------- config.vga-ati | 4 -- config.vga-isavga | 3 -- config.vga-vmware | 6 --- seabios.spec | 43 ++++++++++++++----- 10 files changed, 43 insertions(+), 69 deletions(-) rename 0001-Workaround-for-a-win8.1-32-S4-resume-bug.patch => 0002-Workaround-for-a-win8.1-32-S4-resume-bug.patch (84%) rename 0002-reserve-more-memory-on-fseg.patch => 0003-redhat-reserve-more-memory-on-fseg.patch (95%) rename 0003-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch => 0004-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch (97%) delete mode 100644 config.coreboot delete mode 100644 config.csm delete mode 100644 config.seabios-microvm delete mode 100644 config.vga-ati delete mode 100644 config.vga-isavga delete mode 100644 config.vga-vmware diff --git a/0001-Workaround-for-a-win8.1-32-S4-resume-bug.patch b/0002-Workaround-for-a-win8.1-32-S4-resume-bug.patch similarity index 84% rename from 0001-Workaround-for-a-win8.1-32-S4-resume-bug.patch rename to 0002-Workaround-for-a-win8.1-32-S4-resume-bug.patch index a61d140..b3518b8 100644 --- a/0001-Workaround-for-a-win8.1-32-S4-resume-bug.patch +++ b/0002-Workaround-for-a-win8.1-32-S4-resume-bug.patch @@ -1,4 +1,4 @@ -From 0c1e0d59ceb3c4c8909d7a7b6e62d19c7ad81bef Mon Sep 17 00:00:00 2001 +From d320b19cacb31ca9154682d623dd004eb0681843 Mon Sep 17 00:00:00 2001 From: Radim Krcmar Date: Mon, 10 Mar 2014 15:14:27 +0100 Subject: Workaround for a win8.1-32 S4 resume bug @@ -36,16 +36,6 @@ The reason Windows uses NULL pointer is still unknown, but this bug is blocking WHQL certification, so we have to work around it in 7.0. Signed-off-by: Radim Krčmář ---- -(It is either a Windows bug that is going to be solved on their side, - or we will find a better solution after consulting what went wrong. - Happens on RHEL6 too.) - - src/clock.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -Signed-off-by: Miroslav Rezanina -(cherry picked from commit aa1c26538deecfd820b7da9b3be09ebc20b7fef9) --- src/clock.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) @@ -70,5 +60,5 @@ index e44e112..298a722 100644 pic_eoi1(); } -- -1.8.3.1 +2.18.4 diff --git a/0002-reserve-more-memory-on-fseg.patch b/0003-redhat-reserve-more-memory-on-fseg.patch similarity index 95% rename from 0002-reserve-more-memory-on-fseg.patch rename to 0003-redhat-reserve-more-memory-on-fseg.patch index 859d418..976e756 100644 --- a/0002-reserve-more-memory-on-fseg.patch +++ b/0003-redhat-reserve-more-memory-on-fseg.patch @@ -1,4 +1,4 @@ -From cd088ce3bc68a6986637c0cd77b94ebff729b89b Mon Sep 17 00:00:00 2001 +From 45b10c18abf43fb87ce1f39c8894be498e3ca1ad Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 19 Apr 2016 11:27:50 +0200 Subject: redhat: reserve more memory on fseg @@ -40,5 +40,5 @@ index 6616721..71841aa 100755 # Layout the 16bit code. This ensures sections with fixed offset # requirements are placed in the correct location. It also places the -- -1.8.3.1 +2.18.4 diff --git a/0003-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch b/0004-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch similarity index 97% rename from 0003-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch rename to 0004-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch index 5c26fb4..206fee2 100644 --- a/0003-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch +++ b/0004-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch @@ -1,4 +1,4 @@ -From 4d08ebd4f8dc19dfc36495473b34c34d53650632 Mon Sep 17 00:00:00 2001 +From 1454a162d2bb3e38a4f567ebfd64c75624cb9c19 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Mon, 31 Oct 2016 19:33:05 +0100 Subject: vgabios: Reorder video modes to work around a Windows bug @@ -33,6 +33,9 @@ generate crash dumps. Signed-off-by: Ladi Prosek Signed-off-by: Miroslav Rezanina +--- + vgasrc/svgamodes.c | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/vgasrc/svgamodes.c b/vgasrc/svgamodes.c index 6e494c7..008f1b9 100644 @@ -115,3 +118,6 @@ index 6e494c7..008f1b9 100644 /* custom resolutions for 16:9 displays */ { 0x193, { MM_DIRECT, 1600, 900, 16, 8, 16, SEG_GRAPH } }, +-- +2.18.4 + diff --git a/config.coreboot b/config.coreboot deleted file mode 100644 index a0323b2..0000000 --- a/config.coreboot +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_QEMU_HARDWARE=y -CONFIG_COREBOOT=y diff --git a/config.csm b/config.csm deleted file mode 100644 index c1d8df1..0000000 --- a/config.csm +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_QEMU_HARDWARE=y -CONFIG_CSM=y diff --git a/config.seabios-microvm b/config.seabios-microvm deleted file mode 100644 index a253e2e..0000000 --- a/config.seabios-microvm +++ /dev/null @@ -1,26 +0,0 @@ -CONFIG_QEMU=y -CONFIG_QEMU_HARDWARE=y -CONFIG_PERMIT_UNALIGNED_PCIROM=y -CONFIG_ROM_SIZE=128 -CONFIG_XEN=n -CONFIG_BOOTSPLASH=n -CONFIG_ATA=n -CONFIG_AHCI=n -CONFIG_SDCARD=n -CONFIG_PVSCSI=n -CONFIG_ESP_SCSI=n -CONFIG_LSI_SCSI=n -CONFIG_MEGASAS=n -CONFIG_MPT_SCSI=n -CONFIG_FLOPPY=n -CONFIG_FLASH_FLOPPY=n -CONFIG_NVME=n -CONFIG_PS2PORT=n -CONFIG_USB=n -CONFIG_LPT=n -CONFIG_RTC_TIMER=n -CONFIG_USE_SMM=n -CONFIG_PMTIMER=n -CONFIG_TCGBIOS=n -CONFIG_HARDWARE_IRQ=n -CONFIG_ACPI_PARSE=y diff --git a/config.vga-ati b/config.vga-ati deleted file mode 100644 index 12506b6..0000000 --- a/config.vga-ati +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_QEMU=y -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_ATI=y -CONFIG_VGA_PCI=y diff --git a/config.vga-isavga b/config.vga-isavga deleted file mode 100644 index e55e294..0000000 --- a/config.vga-isavga +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_BOCHS=y -CONFIG_VGA_PCI=n diff --git a/config.vga-vmware b/config.vga-vmware deleted file mode 100644 index eb10427..0000000 --- a/config.vga-vmware +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_BOCHS=y -CONFIG_VGA_PCI=y -CONFIG_OVERRIDE_PCI_ID=y -CONFIG_VGA_VID=0x15ad -CONFIG_VGA_DID=0x0405 diff --git a/seabios.spec b/seabios.spec index f48a5b0..c521206 100644 --- a/seabios.spec +++ b/seabios.spec @@ -4,41 +4,48 @@ Name: seabios Version: 1.14.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source legacy BIOS implementation License: LGPLv3 -URL: http://www.coreboot.org/SeaBIOS +URL: https://www.coreboot.org/SeaBIOS -Source0: http://code.coreboot.org/p/seabios/downloads/get/%{name}-%{version}.tar.gz +Source0: https://code.coreboot.org/p/seabios/downloads/get/seabios-1.14.0.tar.gz -Patch0001: 0001-Workaround-for-a-win8.1-32-S4-resume-bug.patch -Patch0002: 0002-reserve-more-memory-on-fseg.patch -Patch0003: 0003-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch +Patch0002: 0002-Workaround-for-a-win8.1-32-S4-resume-bug.patch +Patch0003: 0003-redhat-reserve-more-memory-on-fseg.patch +Patch0004: 0004-vgabios-Reorder-video-modes-to-work-around-a-Windows.patch Source10: config.vga-cirrus +%if 0%{?fedora:1} Source11: config.vga-isavga +%endif Source12: config.vga-qxl Source13: config.vga-stdvga +%if 0%{?fedora:1} Source14: config.vga-vmware Source15: config.csm Source16: config.coreboot +%endif Source17: config.seabios-128k Source18: config.seabios-256k Source19: config.vga-virtio Source20: config.vga-ramfb Source21: config.vga-bochs-display +%if 0%{?fedora:1} Source22: config.vga-ati Source23: config.seabios-microvm +%endif BuildRequires: make BuildRequires: gcc BuildRequires: python3 iasl + %if 0%{?cross:1} BuildRequires: binutils-x86_64-linux-gnu gcc-x86_64-linux-gnu Buildarch: noarch %else -ExclusiveArch: x86_64 +ExclusiveArch: x86_64 %{power64} %endif Requires: %{name}-bin = %{version}-%{release} @@ -90,19 +97,20 @@ SeaVGABIOS is an open-source VGABIOS implementation. %autopatch -p1 %build +%ifarch x86_64 %define _lto_cflags %{nil} export CFLAGS="$RPM_OPT_FLAGS" mkdir binaries build_bios() { - make clean distclean + make PYTHON=%{__python3} clean distclean cp $1 .config echo "CONFIG_DEBUG_LEVEL=%{debug_level}" >> .config - make oldnoconfig V=1 + make PYTHON=%{__python3} oldnoconfig V=1 EXTRAVERSION="-%release" make V=1 \ EXTRAVERSION="-%{release}" \ - PYTHON=python3 \ + PYTHON=%{__python3} \ %if 0%{?cross:1} HOSTCC=gcc \ CC=x86_64-linux-gnu-gcc \ @@ -120,14 +128,19 @@ build_bios() { # seabios build_bios %{_sourcedir}/config.seabios-128k bios.bin bios.bin build_bios %{_sourcedir}/config.seabios-256k bios.bin bios-256k.bin -build_bios %{_sourcedir}/config.seabios-microvm bios.bin bios-microvm.bin %if 0%{?fedora:1} +build_bios %{_sourcedir}/config.seabios-microvm bios.bin bios-microvm.bin build_bios %{_sourcedir}/config.csm Csm16.bin bios-csm.bin build_bios %{_sourcedir}/config.coreboot bios.bin.elf bios-coreboot.bin %endif + # seavgabios +%if 0%{?fedora:1} %global vgaconfigs bochs-display cirrus isavga qxl stdvga ramfb vmware virtio +%else +%global vgaconfigs cirrus qxl stdvga virtio ramfb bochs-display +%endif for config in %{vgaconfigs}; do build_bios %{_sourcedir}/config.vga-${config} \ vgabios.bin vgabios-${config}.bin out/vgabios.bin @@ -158,8 +171,16 @@ install -m 0644 binaries/vgabios*.bin $RPM_BUILD_ROOT%{_datadir}/seavgabios %dir %{_datadir}/seavgabios/ %{_datadir}/seavgabios/vgabios*.bin +# endif for %ifarch x86_64 {power64} +%endif + %changelog +* Wed Feb 10 2021 Miroslav Rezanina - 1.14.0-3 +- Update to include in RHEL 9 compose +- Resolves: rhbz#1926095 + (qemu-kvm not available for ppc64le) + * Wed Jan 27 2021 Fedora Release Engineering - 1.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild