Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in
at 2023-01-29 14:10:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Sun Jan 29 14:10:13 2023 rev:244 rq:1061672 version:7.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2023-01-14
00:02:23.557422530 +0100
+++ /work/SRC/openSUSE:Factory/.qemu.new.32243/qemu.changes 2023-01-29
14:16:39.932964047 +0100
@@ -1,0 +2,38 @@
+Fri Jan 27 12:14:01 UTC 2023 - Dario Faggioli <dfaggi...@suse.com>
+
+- Refactor building and installing SeaBIOS docs
+
+-------------------------------------------------------------------
+Fri Jan 27 11:30:25 UTC 2023 - Dario Faggioli <dfaggi...@suse.com>
+
+- Rename submodule patches so that it's clear which ones
+ are backports and which ones are downstream only fixes;
+- No functional change intended.
+* Patches dropped:
+ Ignore-spurious-GCC-12-warning.patch
+ roms-sgabios-Fix-csum8-to-be-built-by-ho.patch
+ Makefile-define-endianess-for-cross-buil.patch
+ ipxe-Makefile-fix-issues-of-build-reprod.patch
+ qboot-add-cross.ini-file-to-handle-aarch.patch
+ sgabios-Makefile-fix-issues-of-build-rep.patch
+ Silence-GCC-12-spurious-warnings.patch
+ build-be-explicit-about-mx86-used-note-n.patch
+ enable-cross-compilation-on-ARM.patch
+ stub-out-the-SAN-req-s-in-int13.patch
+ help-compiler-out-by-initializing-array.patch
+ seabios-switch-to-python3-as-needed.patch
+* Patches added:
+ openSUSE-Basetools-Ignore-spurious-GCC-1.patch
+ openSUSE-Makefile-Fix-csum8-to-be-built-.patch
+ openSUSE-Makefile-define-endianess-for-c.patch
+ openSUSE-Makefile-fix-issues-of-build-re.patch
+ openSUSE-add-cross.ini-file-to-handle-aa.patch
+ openSUSE-build-Makefile-fix-issues-of-bu.patch
+ openSUSE-build-Silence-GCC-12-spurious-w.patch
+ openSUSE-build-be-explicit-about-mx86-us.patch
+ openSUSE-build-enable-cross-compilation-.patch
+ openSUSE-pcbios-stub-out-the-SAN-req-s-i.patch
+ openSUSE-switch-to-python3-as-needed.patch
+ openSUSE-test-help-compiler-out-by-initi.patch
+
+-------------------------------------------------------------------
Old:
----
Ignore-spurious-GCC-12-warning.patch
Makefile-define-endianess-for-cross-buil.patch
Silence-GCC-12-spurious-warnings.patch
build-be-explicit-about-mx86-used-note-n.patch
enable-cross-compilation-on-ARM.patch
help-compiler-out-by-initializing-array.patch
ipxe-Makefile-fix-issues-of-build-reprod.patch
qboot-add-cross.ini-file-to-handle-aarch.patch
roms-sgabios-Fix-csum8-to-be-built-by-ho.patch
seabios-switch-to-python3-as-needed.patch
sgabios-Makefile-fix-issues-of-build-rep.patch
stub-out-the-SAN-req-s-in-int13.patch
New:
----
openSUSE-Basetools-Ignore-spurious-GCC-1.patch
openSUSE-Makefile-Fix-csum8-to-be-built-.patch
openSUSE-Makefile-define-endianess-for-c.patch
openSUSE-Makefile-fix-issues-of-build-re.patch
openSUSE-add-cross.ini-file-to-handle-aa.patch
openSUSE-build-Makefile-fix-issues-of-bu.patch
openSUSE-build-Silence-GCC-12-spurious-w.patch
openSUSE-build-be-explicit-about-mx86-us.patch
openSUSE-build-enable-cross-compilation-.patch
openSUSE-pcbios-stub-out-the-SAN-req-s-i.patch
openSUSE-switch-to-python3-as-needed.patch
openSUSE-test-help-compiler-out-by-initi.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.IU24w2/_old 2023-01-29 14:16:41.384971187 +0100
+++ /var/tmp/diff_new_pack.IU24w2/_new 2023-01-29 14:16:41.392971226 +0100
@@ -204,29 +204,29 @@
Patch00041: s390x-pci-let-intercept-devices-have-sep.patch
Patch00042: s390x-pci-reflect-proper-maxstbl-for-gro.patch
# Patches applied in roms/seabios/:
-Patch01000: seabios-switch-to-python3-as-needed.patch
-Patch01001: enable-cross-compilation-on-ARM.patch
-Patch01002: build-be-explicit-about-mx86-used-note-n.patch
+Patch01000: openSUSE-switch-to-python3-as-needed.patch
+Patch01001: openSUSE-build-enable-cross-compilation-.patch
+Patch01002: openSUSE-build-be-explicit-about-mx86-us.patch
# Patches applied in roms/ipxe/:
Patch02000: ath5k-Add-missing-AR5K_EEPROM_READ-in-at.patch
-#Patch02001: stub-out-the-SAN-req-s-in-int13.patch
-Patch02002: ipxe-Makefile-fix-issues-of-build-reprod.patch
-Patch02003: help-compiler-out-by-initializing-array.patch
-Patch02004: Silence-GCC-12-spurious-warnings.patch
+#Patch02001: openSUSE-pcbios-stub-out-the-SAN-req-s-i.patch
+Patch02002: openSUSE-build-Makefile-fix-issues-of-bu.patch
+Patch02003: openSUSE-test-help-compiler-out-by-initi.patch
+Patch02004: openSUSE-build-Silence-GCC-12-spurious-w.patch
# Patches applied in roms/sgabios/:
-Patch03000: sgabios-Makefile-fix-issues-of-build-rep.patch
-Patch03001: roms-sgabios-Fix-csum8-to-be-built-by-ho.patch
+Patch03000: openSUSE-Makefile-fix-issues-of-build-re.patch
+Patch03001: openSUSE-Makefile-Fix-csum8-to-be-built-.patch
# Patches applied in roms/edk2/:
-Patch04000: Ignore-spurious-GCC-12-warning.patch
+Patch04000: openSUSE-Basetools-Ignore-spurious-GCC-1.patch
# Patches applied in roms/skiboot/:
-Patch05000: Makefile-define-endianess-for-cross-buil.patch
+Patch05000: openSUSE-Makefile-define-endianess-for-c.patch
# Patches applied in roms/qboot/:
-Patch11000: qboot-add-cross.ini-file-to-handle-aarch.patch
+Patch11000: openSUSE-add-cross.ini-file-to-handle-aa.patch
# Patches applied in roms/opensbi/:
Patch13000: Makefile-fix-build-with-binutils-2.38.patch
# Patches that will be applied directly across the spec file
-Source1000: stub-out-the-SAN-req-s-in-int13.patch
+Source1000: openSUSE-pcbios-stub-out-the-SAN-req-s-i.patch
# Please do not add patches manually here.
@@ -1589,6 +1589,8 @@
%_datadir/%name/bios-256k.bin
%_datadir/%name/firmware/50-seabios-256k.json
%_datadir/%name/firmware/60-seabios-128k.json
+%license roms/seabios/COPYING
+%doc %_docdir/qemu-seabios
%package vgabios
Summary: VGA BIOSes for QEMU
@@ -1615,6 +1617,7 @@
%_datadir/%name/vgabios-stdvga.bin
%_datadir/%name/vgabios-virtio.bin
%_datadir/%name/vgabios-vmware.bin
+%license roms/seabios/COPYING
%package sgabios
Summary: Serial Graphics Adapter BIOS for QEMU
@@ -1629,11 +1632,10 @@
x86 software to communicate with an attached serial console as if a video card
were attached. For use with QEMU.
-%files sgabios -f roms/seabios/docs/docs.txt
+%files sgabios
%defattr(-, root, root)
%dir %_datadir/%name
%_datadir/%name/sgabios.bin
-%license roms/seabios/COPYING
%package ipxe
Summary: PXE ROMs for QEMU NICs
@@ -1762,34 +1764,6 @@
%build
-%{nil build documentation for SeaBIOS }
-(d=roms/seabios/docs/
-cd "${d}"
-%{nil remember list of jobs in $@ }
-set --
-for f in *.md
- do b="${f%.md}"
-
- %{nil the following 2 commands are independent }
-
- %{nil ensure the correct media type }
- Markdown.pl "${f}" >"${b}.html" & set -- "${@}" "${!}"
-
- %{nil links to b.md will be rendered as to b;
- soft link because %%doc makes a copy }
- ln -Ts "${b}.html" "${b}" & set -- "${@}" "${!}"
-
- echo >>docs.txt %%doc "${d}${b}.html" "${d}${b}"
-
- done
-
- %{nil wait here because we are running in a subshell }
- while ((${#}))
- do wait "${1}"
- shift
- done
- ) & ((seabios_docs_pid = $!))
-
%if %{legacy_qemu_kvm}
# FIXME: Why are we copying the s390 specific one (SOURCE13)?
cp %{SOURCE13} docs/supported.rst
@@ -2140,6 +2114,17 @@
%make_build %{?_smp_mflags} -C %srcdir/roms bios \
SEABIOS_EXTRAVERSION="-rebuilt.opensuse.org" \
+pushd %srcdir/roms/seabios/docs
+for f in *.md
+do
+ b="${f%.md}"
+ # Ensure the correct media type
+ Markdown.pl "${f}" >"${b}.html"
+ # Links to b.md will be rendered as to b
+ ln -Ts "${b}.html" "${b}"
+done
+popd
+
# FIXME: check if we can upstream:
roms-Makefile-add-cross-file-to-qboot-me.patch
# and qboot-add-cross.ini-file-to-handle-aarch.patch
%make_build -C %srcdir/roms qboot
@@ -2163,7 +2148,7 @@
%if %{force_fit_virtio_pxe_rom}
pushd %srcdir
-patch -p1 < %_sourcedir/stub-out-the-SAN-req-s-in-int13.patch
+patch -p1 < %_sourcedir/openSUSE-pcbios-stub-out-the-SAN-req-s-i.patch
popd
%make_build -C %srcdir/roms pxerom_variants=virtio pxerom_targets=1af41000
pxerom
%endif
@@ -2191,7 +2176,6 @@
# End of the build for qemu
%endif
-wait "${seabios_docs_pid}"
%install
cd %blddir
@@ -2305,6 +2289,7 @@
%if %{build_x86_firmware}
install -D -m 0644 %{SOURCE14}
%{buildroot}%_datadir/%name/firmware/50-seabios-256k.json
install -D -m 0644 %{SOURCE15}
%{buildroot}%_datadir/%name/firmware/60-seabios-128k.json
+install -d -m 0755 %{buildroot}%_docdir/qemu-seabios
%else
for f in %{x86_extra_firmware} ; do
unlink %{buildroot}%_datadir/%name/$f
++++++ bundles.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/repo new/repo
--- old/repo 2022-09-20 19:50:47.000000000 +0200
+++ new/repo 2023-01-27 12:17:20.000000000 +0100
@@ -1 +1 @@
-https://github.com/openSUSE/qemu.git
+https://git.qemu.org/git/qemu.git
Binary files old/roms/edk2/b24306f15daa2ff8510b06702114724b33895d3c.bundle and
new/roms/edk2/b24306f15daa2ff8510b06702114724b33895d3c.bundle differ
Binary files old/roms/ipxe/4bd064de239dab2426b31c9789a1f4d78087dc63.bundle and
new/roms/ipxe/4bd064de239dab2426b31c9789a1f4d78087dc63.bundle differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/roms/ipxe/repo new/roms/ipxe/repo
--- old/roms/ipxe/repo 2022-09-20 19:50:47.000000000 +0200
+++ new/roms/ipxe/repo 2023-01-27 12:17:20.000000000 +0100
@@ -1 +1 @@
-https://github.com/openSUSE/qemu-ipxe.git
+https://git.qemu.org/git/ipxe.git
Binary files old/roms/opensbi/48f91ee9c960f048c4a7d1da4447d31e04931e38.bundle
and new/roms/opensbi/48f91ee9c960f048c4a7d1da4447d31e04931e38.bundle differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/roms/opensbi/repo new/roms/opensbi/repo
--- old/roms/opensbi/repo 2022-09-20 19:50:47.000000000 +0200
+++ new/roms/opensbi/repo 2023-01-27 12:17:20.000000000 +0100
@@ -1 +1 @@
-https://github.com/openSUSE/qemu-opensbi.git
+https://git.qemu.org/git/opensbi.git
Binary files old/roms/qboot/a5300c4949b8d4de2d34bedfaed66793f48ec948.bundle and
new/roms/qboot/a5300c4949b8d4de2d34bedfaed66793f48ec948.bundle differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/roms/qboot/repo new/roms/qboot/repo
--- old/roms/qboot/repo 2022-09-20 19:50:47.000000000 +0200
+++ new/roms/qboot/repo 2023-01-27 12:17:20.000000000 +0100
@@ -1 +1 @@
-https://github.com/openSUSE/qemu-qboot.git
+https://github.com/bonzini/qboot
Binary files old/roms/seabios/d239552ce7220e448ae81f41515138f7b9e3c4db.bundle
and new/roms/seabios/d239552ce7220e448ae81f41515138f7b9e3c4db.bundle differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/roms/seabios/repo new/roms/seabios/repo
--- old/roms/seabios/repo 2022-09-20 19:50:47.000000000 +0200
+++ new/roms/seabios/repo 2023-01-27 12:17:20.000000000 +0100
@@ -1 +1 @@
-https://github.com/openSUSE/qemu-seabios.git
+https://git.qemu.org/git/seabios.git/
Binary files old/roms/sgabios/cbaee52287e5f32373181cff50a00b6c4ac9015a.bundle
and new/roms/sgabios/cbaee52287e5f32373181cff50a00b6c4ac9015a.bundle differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/roms/sgabios/repo new/roms/sgabios/repo
--- old/roms/sgabios/repo 2022-09-20 19:50:47.000000000 +0200
+++ new/roms/sgabios/repo 2023-01-27 12:17:20.000000000 +0100
@@ -1 +1 @@
-https://github.com/openSUSE/qemu-sgabios.git
+https://git.qemu.org/git/sgabios.git
Binary files old/roms/skiboot/24a7eb35966d93455520bc2debdd7954314b638b.bundle
and new/roms/skiboot/24a7eb35966d93455520bc2debdd7954314b638b.bundle differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/roms/skiboot/repo new/roms/skiboot/repo
--- old/roms/skiboot/repo 2022-09-20 19:50:47.000000000 +0200
+++ new/roms/skiboot/repo 2023-01-27 12:17:20.000000000 +0100
@@ -1 +1 @@
-https://github.com/openSUSE/qemu-skiboot.git
+https://gitlab.com/qemu-project/skiboot.git
++++++ openSUSE-Basetools-Ignore-spurious-GCC-1.patch ++++++
From: =?UTF-8?q?Martin=20Li=C5=A1ka?= <Martin Liška>
Date: Tue, 22 Mar 2022 11:40:17 +0100
Subject: [openSUSE] Basetools: Ignore spurious GCC 12 warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
References: bsc#1197018
Building with GCC 12 fails producing errors. This is an example (but
there are others):
[ 1051s] Sdk/C/LzmaEnc.c: In function 'LzmaEnc_CodeOneMemBlock':
[ 1051s] Sdk/C/LzmaEnc.c:2641:19: error: storing the address of local
variable 'outStream' in '*p.rc.outStream' [-Werror=dangling-pointer=]
[ 1051s] 2641 | p->rc.outStream = &outStream.vt;
[ 1051s] | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
[ 1051s] Sdk/C/LzmaEnc.c:2624:28: note: 'outStream' declared here
[ 1051s] 2624 | CLzmaEnc_SeqOutStreamBuf outStream;
[ 1051s] | ^~~~~~~~~
[ 1051s] Sdk/C/LzmaEnc.c:2624:28: note: 'pp' declared here
Which is a false positive reported by GCC compiler:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98503
Work it around by silencing the warning.
Signed-off-by: Martin Liška <martin.li...@suse.com>
Signed-off-by: Dario Faggioli <dfaggi...@suse.com>
---
BaseTools/Source/C/DevicePath/DevicePathUtilities.c | 4 ++++
BaseTools/Source/C/GenFfs/GenFfs.c | 4 ++++
BaseTools/Source/C/GenSec/GenSec.c | 4 ++++
BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/roms/edk2/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
b/roms/edk2/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
index 2ffefa8ceeeff9a1d0504ad71918..c9fb4329843a8fc34e596b506571 100644
--- a/roms/edk2/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
+++ b/roms/edk2/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
@@ -16,6 +16,10 @@
#include "UefiDevicePathLib.h"
#include <Protocol/DevicePathUtilities.h>
+#if __GNUC__ >= 12
+# pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
+
//
// Template for an end-of-device path node.
//
diff --git a/roms/edk2/BaseTools/Source/C/GenFfs/GenFfs.c
b/roms/edk2/BaseTools/Source/C/GenFfs/GenFfs.c
index 949025c333251bc5776159a6c535..be55a529743494677f8515906c6c 100644
--- a/roms/edk2/BaseTools/Source/C/GenFfs/GenFfs.c
+++ b/roms/edk2/BaseTools/Source/C/GenFfs/GenFfs.c
@@ -36,6 +36,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define UTILITY_MAJOR_VERSION 0
#define UTILITY_MINOR_VERSION 1
+#if __GNUC__ >= 12
+# pragma GCC diagnostic ignored "-Wuse-after-free"
+#endif
+
STATIC CHAR8 *mFfsFileType[] = {
NULL, // 0x00
"EFI_FV_FILETYPE_RAW", // 0x01
diff --git a/roms/edk2/BaseTools/Source/C/GenSec/GenSec.c
b/roms/edk2/BaseTools/Source/C/GenSec/GenSec.c
index d54a4f9e0a7d67b7c8494ab37011..fb40ad36584c1cd53cc7ca4a9d4f 100644
--- a/roms/edk2/BaseTools/Source/C/GenSec/GenSec.c
+++ b/roms/edk2/BaseTools/Source/C/GenSec/GenSec.c
@@ -37,6 +37,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define UTILITY_MAJOR_VERSION 0
#define UTILITY_MINOR_VERSION 1
+#if __GNUC__ >= 12
+# pragma GCC diagnostic ignored "-Wuse-after-free"
+#endif
+
STATIC CHAR8 *mSectionTypeName[] = {
NULL, // 0x00 - reserved
"EFI_SECTION_COMPRESSION", // 0x01
diff --git a/roms/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
b/roms/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
index 4e9b499f8d80dc4d6bc13515e794..ab9b7cc34f69bceb74c454ce5032 100644
--- a/roms/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
+++ b/roms/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
@@ -40,6 +40,10 @@ static unsigned g_STAT_OFFSET = 0;
#define REP_LEN_COUNT 64
+#if __GNUC__ >= 12
+# pragma GCC diagnostic ignored "-Wdangling-pointer"
+#endif
+
void LzmaEncProps_Init(CLzmaEncProps *p)
{
p->level = 5;
++++++ openSUSE-Makefile-Fix-csum8-to-be-built-.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Thu, 27 Jun 2019 09:38:43 -0600
Subject: [openSUSE] Makefile: Fix csum8 to be built by host compiler
Signed-off-by: Bruce Rogers <brog...@suse.com
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/sgabios/Makefile b/roms/sgabios/Makefile
index d2934c9f678dadfae5201b8507e9..d7e108faf69007056ddc08c4e63c 100644
--- a/roms/sgabios/Makefile
+++ b/roms/sgabios/Makefile
@@ -55,7 +55,7 @@ sgabios.elf: .depend $(OBJS) $(LDSCRIPT) csum8
$(LD) $(LDFLAGS) $(OBJS) -o $@
csum8: csum8.c
- $(CC) -Wall -O2 -o $@ $<
+ $(HOSTCC) -Wall -O2 -o $@ $<
sgabios.o: buildinfo
++++++ openSUSE-Makefile-define-endianess-for-c.patch ++++++
From: Dario Faggioli <dfaggi...@suse.com>
Date: Wed, 16 Feb 2022 19:22:01 +0100
Subject: [openSUSE] Makefile: define endianess for cross-building on aarch64
References: bsc#1193545
Include aarch64 in the endianess check, so we can cross-build from
there too.
Signed-of-by: Dario Faggioli <dfaggi...@suse.com>
---
Makefile.main | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/skiboot/Makefile.main b/roms/skiboot/Makefile.main
index c8a63e8b110f3c6bf115314da7bf..98790ec5c3b0f35272f032798353 100644
--- a/roms/skiboot/Makefile.main
+++ b/roms/skiboot/Makefile.main
@@ -50,7 +50,7 @@ endif
# Host tools and options
HOSTCC=gcc
-HOSTEND=$(shell uname -m | sed -e 's/^i.*86$$/LITTLE/' -e 's/^x86.*/LITTLE/'
-e 's/^ppc64le/LITTLE/' -e 's/^ppc.*/BIG/')
+HOSTEND=$(shell uname -m | sed -e 's/^i.*86$$/LITTLE/' -e 's/^x86.*/LITTLE/'
-e 's/^ppc64le/LITTLE/' -e 's/^aarch64/LITTLE/' -e 's/^ppc.*/BIG/')
HOSTCFLAGS:=-O1 $(CWARNS) -DHAVE_$(HOSTEND)_ENDIAN -MMD
HOSTCFLAGS += $(call try-cflag,$(HOSTCC),-std=gnu11)
HOSTCFLAGS += $(call try-cflag,$(HOSTCC),-m64)
++++++ openSUSE-Makefile-fix-issues-of-build-re.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Thu, 27 Jun 2019 10:15:24 -0600
Subject: [openSUSE] Makefile: fix issues of build reproducibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It is desirable to produce the same bits on subsequent
builds when the actual code of the package doesn't
change. (bsc#1011213)
Signed-off-by: Bruce Rogers <brog...@suse.com>
Signed-off-by: Andreas Färber <afaer...@suse.de>
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/roms/sgabios/Makefile b/roms/sgabios/Makefile
index 970b0ff37a1ae58e98d0527da215..d2934c9f678dadfae5201b8507e9 100644
--- a/roms/sgabios/Makefile
+++ b/roms/sgabios/Makefile
@@ -14,10 +14,10 @@
#
# $Id$
-BUILD_DATE = \"$(shell date -u)\"
-BUILD_SHORT_DATE = \"$(shell date -u +%D)\"
-BUILD_HOST = \"$(shell hostname)\"
-BUILD_USER = \"$(shell whoami)\"
+BUILD_DATE = \"$(shell date --date='@$(PACKAGING_TIMESTAMP)' -u)\"
+BUILD_SHORT_DATE = \"$(shell date --date='@$(PACKAGING_TIMESTAMP)' -u +%D)\"
+BUILD_HOST = \"buildhost\"
+BUILD_USER = \"geeko\"
CFLAGS := -Wall -Os -m32 -nostdlib
++++++ openSUSE-add-cross.ini-file-to-handle-aa.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Mon, 23 Nov 2020 07:06:37 -0700
Subject: [openSUSE] add cross.ini file to handle aarch64 based build
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
cross.ini | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/roms/qboot/cross.ini b/roms/qboot/cross.ini
new file mode 100644
index
0000000000000000000000000000000000000000..4b3584da7e189efad7865450bf5310685c2e0f31
--- /dev/null
+++ b/roms/qboot/cross.ini
@@ -0,0 +1,8 @@
+[host_machine]
+system = 'linux'
+cpu_family = 'x86'
+cpu = 'x86_64'
+endian = 'little'
+
+[binaries]
+c = 'x86_64-suse-linux-gcc'
++++++ openSUSE-build-Makefile-fix-issues-of-bu.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Thu, 27 Jun 2019 10:15:24 -0600
Subject: [openSUSE] [build] Makefile: fix issues of build reproducibility
References: bsc#1011213
It is desirable to produce the same bits on subsequent
builds when the actual code of the package doesn't
change. (bsc#1011213)
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
src/Makefile.housekeeping | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/roms/ipxe/src/Makefile.housekeeping
b/roms/ipxe/src/Makefile.housekeeping
index 134becd508c2f7f7c01c2f601d36..36cfb950e014914232f254b7edbb 100644
--- a/roms/ipxe/src/Makefile.housekeeping
+++ b/roms/ipxe/src/Makefile.housekeeping
@@ -1163,11 +1163,18 @@ blib : $(BLIB)
# Command to generate build ID. Must be unique for each $(BIN)/%.tmp,
# even within the same build run.
#
-BUILD_ID_CMD := perl -e 'printf "0x%08x", int ( rand ( 0xffffffff ) );'
+# NB: In the case of the SUSE qemu-ipxe package we want reproducible
+# builds, so we just use the TGT_ROM_NAME variable, which is already
+# a unique (in the context of the files we generate) hex value suitable
+# for specifying the build_id. We no longer define a BUILD_ID_CMD, as
+# we need to use the TGT_ROM_NAME variable directly in the link command
# Build timestamp
#
-BUILD_TIMESTAMP := $(shell date +%s)
+# NB: In the case of the SUSE qemu-ipxe package we want reproducible
+# builds, so we use a pre-determined timestamp, rather than the current
+# timestamp
+BUILD_TIMESTAMP := $(PACKAGING_TIMESTAMP)
# Build version
#
@@ -1187,7 +1194,7 @@ $(BIN)/version.%.o : core/version.c $(MAKEDEPS)
$(GIT_INDEX)
$(BIN)/%.tmp : $(BIN)/version.%.o $(BLIB) $(MAKEDEPS) $(LDSCRIPT)
$(QM)$(ECHO) " [LD] $@"
$(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $< $(BLIB) -o $@ \
- --defsym _build_id=`$(BUILD_ID_CMD)` \
+ --defsym _build_id=`$(PRINTF) "0x%b" "$(TGT_ROM_NAME)"` \
--defsym _build_timestamp=$(BUILD_TIMESTAMP) \
-Map $(BIN)/$*.tmp.map
$(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
++++++ openSUSE-build-Silence-GCC-12-spurious-w.patch ++++++
From: =?UTF-8?q?Martin=20Li=C5=A1ka?= <martin.li...@suse.com>
Date: Tue, 22 Mar 2022 10:52:19 +0100
Subject: [openSUSE] [build] Silence GCC 12 spurious warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
References: bsc#1197018
With GCC 12, build fails like this:
[ 6245s] inlined from 'memcpy_user' at
arch/x86/include/librm.h:155:2,
[ 6245s] inlined from 'copy_from_user' at
include/ipxe/uaccess.h:338:2,
[ 6245s] inlined from 'acpi_sx_zsdt' at core/acpi.c:217:3:
[ 6245s] arch/x86/include/bits/string.h:79:32: error: array subscript
'union <anonymous>[0]' is partly outside array bounds of 'union
<anonymous>[1]' [-Werror=array-bounds]
[ 6245s] 79 | dest_u->u32[0] = src_u->u32[0];
[ 6245s] | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
[ 6245s] core/acpi.c: In function 'acpi_sx_zsdt':
[ 6245s] core/acpi.c:191:11: note: object 'buf' of size 4
[ 6245s] 191 | } buf;
[ 6245s] | ^~~
Which is a false positive reported by GCC compiler:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98503
Silence the watning.
Signed-off-by: Martin Liška <martin.li...@suse.com>
Upstream, this is done by commit:
b0ded89e917b48b73097d3b8b88dfa3afb264ed0 ([build] Disable
dangling pointer checking for GCC)
Signed-off-by: Dario Faggioli <dfaggi...@suse.com>
---
src/Makefile.housekeeping | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/roms/ipxe/src/Makefile.housekeeping
b/roms/ipxe/src/Makefile.housekeeping
index 36cfb950e014914232f254b7edbb..cad327d31dbe0bd69d956c32d28d 100644
--- a/roms/ipxe/src/Makefile.housekeeping
+++ b/roms/ipxe/src/Makefile.housekeeping
@@ -183,6 +183,19 @@ WNAPM_TEST = $(CC) -Wno-address-of-packed-member -x c -c
/dev/null \
WNAPM_FLAGS := $(shell $(WNAPM_TEST) && \
$(ECHO) '-Wno-address-of-packed-member')
WORKAROUND_CFLAGS += $(WNAPM_FLAGS)
+
+# gcc 12.1 generates false positive warnings. Inhibit the warnings.
+WNAB_TEST = $(CC) -Wno-array-bounds -x c -c /dev/null \
+ -o /dev/null >/dev/null 2>&1
+WNAB_FLAGS := $(shell $(WNAB_TEST) && \
+ $(ECHO) '-Wno-array-bounds')
+WORKAROUND_CFLAGS += $(WNAB_FLAGS)
+
+WNDP_TEST = $(CC) -Wno-dangling-pointer-x c -c /dev/null \
+ -o /dev/null >/dev/null 2>&1
+WNDP_FLAGS := $(shell $(WNAB_TEST) && \
+ $(ECHO) '-Wno-dangling-pointer')
+WORKAROUND_CFLAGS += $(WNDP_FLAGS)
endif
# Some versions of gas choke on division operators, treating them as
++++++ openSUSE-build-be-explicit-about-mx86-us.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Thu, 4 Feb 2021 11:06:47 -0700
Subject: [openSUSE] build: be explicit about -mx86-used-note=no
binutils v2.36 switched the default for the assembler's -mx86-used-note,
which caused breakage building seavgabios as follows:
ld: section .note.gnu.property LMA [0000000000000000,0000000000000027]
overlaps section .text LMA [0000000000000000,0000000000006e87]
Fix by explicitly specifying -mx86-used-note=no to assembler in seabios'
Makefile (boo#1181775)
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile
index 5ced69cd8be94d36c8aaa887ce73..e0c51a4e455e9796437b7f59dd17 100644
--- a/roms/seabios/Makefile
+++ b/roms/seabios/Makefile
@@ -73,6 +73,7 @@ COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,)
COMMONCFLAGS += $(call cc-option,$(CC),-Wno-address-of-packed-member,)
COMMONCFLAGS += $(call cc-option,$(CC),-fcf-protection=none,)
COMMA := ,
+COMMONCFLAGS += $(call cc-option,$(CC),-Wa$(COMMA)-mx86-used-note=no,)
CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0
CFLAGSSEG := $(COMMONCFLAGS) -DMODESEGMENT=1 -fno-defer-pop \
++++++ openSUSE-build-enable-cross-compilation-.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Mon, 26 Aug 2019 13:28:57 -0600
Subject: [openSUSE] build: enable cross compilation on ARM
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile
index 408983026669e531dcb84230dd23..5ced69cd8be94d36c8aaa887ce73 100644
--- a/roms/seabios/Makefile
+++ b/roms/seabios/Makefile
@@ -13,7 +13,7 @@ export CONFIG_SHELL := sh
export KCONFIG_AUTOHEADER := autoconf.h
export KCONFIG_CONFIG := $(CURDIR)/.config
export LC_ALL := C
-CROSS_PREFIX=
+CROSS_PREFIX=$(CROSS_COMPILE)
ifneq ($(CROSS_PREFIX),)
CC=$(CROSS_PREFIX)gcc
endif
++++++ openSUSE-pcbios-stub-out-the-SAN-req-s-i.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Mon, 24 Jul 2017 10:44:24 -0600
Subject: [openSUSE] [pcbios] stub out the SAN req's in int13
Include-If: %if 0%{?patch-possibly-applied-elsewhere}
We need to find some code or data to change so we can make the rom fit
into the legacy size requirements. Comment out SAN support, and
hopefully nobody will be impacted.
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
src/arch/x86/interface/pcbios/int13.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/roms/ipxe/src/arch/x86/interface/pcbios/int13.c
b/roms/ipxe/src/arch/x86/interface/pcbios/int13.c
index ca789a0d154e1fe3c2508a3aefea..40c61419c0c134120d1ce7c81a1e 100644
--- a/roms/ipxe/src/arch/x86/interface/pcbios/int13.c
+++ b/roms/ipxe/src/arch/x86/interface/pcbios/int13.c
@@ -23,6 +23,12 @@
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+#define INCLUDE_SAN_HOOKS 0
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
#include <stdint.h>
#include <stdlib.h>
#include <limits.h>
@@ -1243,6 +1249,7 @@ static void int13_unhook_vector ( void ) {
*/
static int int13_hook ( unsigned int drive, struct uri **uris,
unsigned int count, unsigned int flags ) {
+#if INCLUDE_SAN_HOOKS
struct san_device *sandev;
struct int13_data *int13;
unsigned int natural_drive;
@@ -1315,6 +1322,9 @@ static int int13_hook ( unsigned int drive, struct uri
**uris,
sandev_put ( sandev );
err_alloc:
return rc;
+#else
+ return -1;
+#endif
}
/**
@@ -1328,6 +1338,7 @@ static int int13_hook ( unsigned int drive, struct uri
**uris,
*/
static void int13_unhook ( unsigned int drive ) {
struct san_device *sandev;
+#if INCLUDE_SAN_HOOKS
/* Find drive */
sandev = sandev_find ( drive );
@@ -1353,6 +1364,7 @@ static void int13_unhook ( unsigned int drive ) {
/* Drop reference to drive */
sandev_put ( sandev );
+#endif
}
/**
@@ -1514,6 +1526,7 @@ static int int13_load_eltorito ( unsigned int drive,
struct segoff *address ) {
* Note that this function can never return success, by definition.
*/
static int int13_boot ( unsigned int drive, const char *filename __unused ) {
+#if INCLUDE_SAN_HOOKS
struct memory_map memmap;
struct segoff address;
int rc;
@@ -1539,6 +1552,9 @@ static int int13_boot ( unsigned int drive, const char
*filename __unused ) {
}
return -ECANCELED; /* -EIMPOSSIBLE */
+#else
+ return -1;
+#endif
}
/** Maximum size of boot firmware table(s) */
@@ -1605,6 +1621,7 @@ static int int13_install ( struct acpi_header *acpi ) {
* @ret rc Return status code
*/
static int int13_describe ( void ) {
+#if INCLUDE_SAN_HOOKS
int rc;
/* Clear tables */
@@ -1619,9 +1636,13 @@ static int int13_describe ( void ) {
}
return 0;
+#else
+ return -1;
+#endif
}
PROVIDE_SANBOOT ( pcbios, san_hook, int13_hook );
PROVIDE_SANBOOT ( pcbios, san_unhook, int13_unhook );
PROVIDE_SANBOOT ( pcbios, san_boot, int13_boot );
PROVIDE_SANBOOT ( pcbios, san_describe, int13_describe );
+#pragma GCC diagnostic pop
++++++ openSUSE-switch-to-python3-as-needed.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Thu, 27 Jun 2019 10:15:24 -0600
Subject: [openSUSE] switch to python3 as needed
Switch to python3 the places where "python2" is explicitly referenced.
(Ignore the uses of #!/usr/bin/env python, since that usage does the
right thing in our build environment).
Include changes proposed by the python3 2to3 tool.
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
Makefile | 2 +-
scripts/acpi_extract.py | 4 ++--
scripts/acpi_extract_preprocess.py | 2 +-
scripts/layoutrom.py | 28 ++++++++++++++--------------
scripts/vgafixup.py | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile
index c108f87de7683667d1a0cad6b9e5..408983026669e531dcb84230dd23 100644
--- a/roms/seabios/Makefile
+++ b/roms/seabios/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=cpp
IASL:=iasl
LD32BIT_FLAG:=-melf_i386
diff --git a/roms/seabios/scripts/acpi_extract.py
b/roms/seabios/scripts/acpi_extract.py
index 3ed863b6a79412a1276bb905d08f..7ac054e626780253fcec78414b17 100755
--- a/roms/seabios/scripts/acpi_extract.py
+++ b/roms/seabios/scripts/acpi_extract.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <m...@redhat.com>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
@@ -348,7 +348,7 @@ def main():
# Pretty print output
outstrs = ["/* DO NOT EDIT! This is an autogenerated file."
" See scripts/acpi_extract.py. */"]
- for array in output.keys():
+ for array in list(output.keys()):
otype = get_value_type(max(output[array]))
outstrs.append("static unsigned %s %s[] = {" % (otype, array))
odata = []
diff --git a/roms/seabios/scripts/acpi_extract_preprocess.py
b/roms/seabios/scripts/acpi_extract_preprocess.py
index 2698118406d97c164783335c7fb6..6963847a8b5d3e4bf9340a67afe2 100755
--- a/roms/seabios/scripts/acpi_extract_preprocess.py
+++ b/roms/seabios/scripts/acpi_extract_preprocess.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <m...@redhat.com>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
diff --git a/roms/seabios/scripts/layoutrom.py
b/roms/seabios/scripts/layoutrom.py
index abebf0211fa9627cec31cce76b8d..34b3e68f556af124346755e87c58 100755
--- a/roms/seabios/scripts/layoutrom.py
+++ b/roms/seabios/scripts/layoutrom.py
@@ -81,8 +81,8 @@ def fitSections(sections, fillsections):
section.finalsegloc = addr
fixedsections.append((addr, section))
if section.align != 1:
- print("Error: Fixed section %s has non-zero alignment (%d)" % (
- section.name, section.align))
+ print(("Error: Fixed section %s has non-zero alignment (%d)" %
(
+ section.name, section.align)))
sys.exit(1)
fixedsections.sort(key=operator.itemgetter(0))
firstfixed = fixedsections[0][0]
@@ -142,10 +142,10 @@ def fitSections(sections, fillsections):
# Report stats
total = BUILD_BIOS_SIZE-firstfixed
slack = total - totalused
- print ("Fixed space: 0x%x-0x%x total: %d slack: %d"
+ print(("Fixed space: 0x%x-0x%x total: %d slack: %d"
" Percent slack: %.1f%%" % (
firstfixed, BUILD_BIOS_SIZE, total, slack,
- (float(slack) / total) * 100.0))
+ (float(slack) / total) * 100.0)))
return firstfixed + BUILD_BIOS_ADDR
@@ -288,12 +288,12 @@ def doLayout(sections, config, genreloc):
size32flat = sec32fseg_start - sec32flat_start
size32init = sec32flat_start - sec32init_start
sizelow = li.sec32low_end - li.sec32low_start
- print("16bit size: %d" % size16)
- print("32bit segmented size: %d" % size32seg)
- print("32bit flat size: %d" % (size32flat + size32textfseg))
- print("32bit flat init size: %d" % size32init)
- print("Lowmem size: %d" % sizelow)
- print("f-segment var size: %d" % size32fseg)
+ print(("16bit size: %d" % size16))
+ print(("32bit segmented size: %d" % size32seg))
+ print(("32bit flat size: %d" % (size32flat + size32textfseg)))
+ print(("32bit flat init size: %d" % size32init))
+ print(("Lowmem size: %d" % sizelow))
+ print(("f-segment var size: %d" % size32fseg))
return li
@@ -312,7 +312,7 @@ def outXRefs(sections, useseg=0, exportsyms=[],
forcedelta=0):
and (symbol.section.fileid != section.fileid
or symbol.name != reloc.symbolname)):
xrefs[reloc.symbolname] = symbol
- for symbolname, symbol in xrefs.items():
+ for symbolname, symbol in list(xrefs.items()):
loc = symbol.section.finalloc
if useseg:
loc = symbol.section.finalsegloc
@@ -482,8 +482,8 @@ def checkRuntime(reloc, rsection, data, chain):
if section is None or '.init.' in section.name:
return 0
if '.data.varinit.' in section.name:
- print("ERROR: %s is VARVERIFY32INIT but used from %s" % (
- section.name, chain))
+ print(("ERROR: %s is VARVERIFY32INIT but used from %s" % (
+ section.name, chain)))
sys.exit(1)
return 1
@@ -695,7 +695,7 @@ def main():
li = doLayout(sections, config, genreloc)
# Exported symbols
- li.varlowsyms = [symbol for symbol in symbols['32flat'].values()
+ li.varlowsyms = [symbol for symbol in list(symbols['32flat'].values())
if (symbol.section is not None
and symbol.section.finalloc is not None
and '.data.varlow.' in symbol.section.name
diff --git a/roms/seabios/scripts/vgafixup.py b/roms/seabios/scripts/vgafixup.py
index 2053cd5d78e5935658e1fecec074..dc662480f909e27958fa906d73b1 100644
--- a/roms/seabios/scripts/vgafixup.py
+++ b/roms/seabios/scripts/vgafixup.py
@@ -29,7 +29,7 @@ re_leal = re.compile(
def handle_leal(sline):
m = re_leal.match(sline[5:])
if m is None or m.group('index') == '%esp':
- print("Unable to fixup leal instruction: %s" % (sline,))
+ print(("Unable to fixup leal instruction: %s" % (sline,)))
sys.exit(-1)
offset, base, index, scale, dest = m.group(
'offset', 'base', 'index', 'scale', 'dest')
++++++ openSUSE-test-help-compiler-out-by-initi.patch ++++++
From: Bruce Rogers <brog...@suse.com>
Date: Thu, 13 Aug 2020 18:23:35 -0600
Subject: [openSUSE] [test] help compiler out by initializing array
The pre-release gcc 11 compiler is complaining that result_raw in
bigint_test_exec is flagged as possibly being uninitialized when used
(-Werror=maybe-uninitialized). Help the compiler by initializing the
array.
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
src/tests/bigint_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/ipxe/src/tests/bigint_test.c
b/roms/ipxe/src/tests/bigint_test.c
index 8d40c3188784a693e83a2a9d3217..dfcd393c413b1c66ab2e9988c472 100644
--- a/roms/ipxe/src/tests/bigint_test.c
+++ b/roms/ipxe/src/tests/bigint_test.c
@@ -210,7 +210,7 @@ void bigint_mod_exp_sample ( const bigint_element_t *base0,
static const uint8_t addend_raw[] = addend; \
static const uint8_t value_raw[] = value; \
static const uint8_t expected_raw[] = expected; \
- uint8_t result_raw[ sizeof ( expected_raw ) ]; \
+ uint8_t result_raw[ sizeof ( expected_raw ) ] = {0}; \
unsigned int size = \
bigint_required_size ( sizeof ( value_raw ) ); \
bigint_t ( size ) addend_temp; \
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.IU24w2/_old 2023-01-29 14:16:41.916973803 +0100
+++ /var/tmp/diff_new_pack.IU24w2/_new 2023-01-29 14:16:41.920973822 +0100
@@ -1522,6 +1522,8 @@
%_datadir/%name/bios-256k.bin
%_datadir/%name/firmware/50-seabios-256k.json
%_datadir/%name/firmware/60-seabios-128k.json
+%license roms/seabios/COPYING
+%doc %_docdir/qemu-seabios
%package vgabios
Summary: VGA BIOSes for QEMU
@@ -1548,6 +1550,7 @@
%_datadir/%name/vgabios-stdvga.bin
%_datadir/%name/vgabios-virtio.bin
%_datadir/%name/vgabios-vmware.bin
+%license roms/seabios/COPYING
%package sgabios
Summary: Serial Graphics Adapter BIOS for QEMU
@@ -1562,11 +1565,10 @@
x86 software to communicate with an attached serial console as if a video card
were attached. For use with QEMU.
-%files sgabios -f roms/seabios/docs/docs.txt
+%files sgabios
%defattr(-, root, root)
%dir %_datadir/%name
%_datadir/%name/sgabios.bin
-%license roms/seabios/COPYING
%package ipxe
Summary: PXE ROMs for QEMU NICs
@@ -1695,35 +1697,6 @@
%build
-%{nil build documentation for SeaBIOS }
-(d=roms/seabios/docs/
-cd "${d}"
-%{nil remember list of jobs in $@ }
-set --
-for f in *.md
- do b="${f%.md}"
-
- %{nil the following 2 commands are independent }
-
- %{nil ensure the correct media type }
- Markdown.pl "${f}" >"${b}.html" & set -- "${@}" "${!}"
-
- %{nil links to b.md will be rendered as to b;
- soft link because %%doc makes a copy }
- ln -Ts "${b}.html" "${b}" & set -- "${@}" "${!}"
-
- echo >>docs.txt %%doc "${d}${b}.html" "${d}${b}"
-
- done
-
- %{nil wait here because we are running in a subshell }
- while ((${#}))
- do wait "${1}"
- shift
- done
- ) & ((seabios_docs_pid = $!))
-
-
%if %{legacy_qemu_kvm}
# FIXME: Why are we copying the s390 specific one (SOURCE13)?
cp %{SOURCE13} docs/supported.rst
@@ -2074,6 +2047,17 @@
%make_build %{?_smp_mflags} -C %srcdir/roms bios \
SEABIOS_EXTRAVERSION="-rebuilt.opensuse.org" \
+pushd %srcdir/roms/seabios/docs
+for f in *.md
+do
+ b="${f%.md}"
+ # Ensure the correct media type
+ Markdown.pl "${f}" >"${b}.html"
+ # Links to b.md will be rendered as to b
+ ln -Ts "${b}.html" "${b}"
+done
+popd
+
# FIXME: check if we can upstream:
roms-Makefile-add-cross-file-to-qboot-me.patch
# and qboot-add-cross.ini-file-to-handle-aarch.patch
%make_build -C %srcdir/roms qboot
@@ -2097,7 +2081,7 @@
%if %{force_fit_virtio_pxe_rom}
pushd %srcdir
-patch -p1 < %_sourcedir/stub-out-the-SAN-req-s-in-int13.patch
+patch -p1 < %_sourcedir/openSUSE-pcbios-stub-out-the-SAN-req-s-i.patch
popd
%make_build -C %srcdir/roms pxerom_variants=virtio pxerom_targets=1af41000
pxerom
%endif
@@ -2125,7 +2109,6 @@
# End of the build for qemu
%endif
-wait "${seabios_docs_pid}"
%install
cd %blddir
@@ -2239,6 +2222,7 @@
%if %{build_x86_firmware}
install -D -m 0644 %{SOURCE14}
%{buildroot}%_datadir/%name/firmware/50-seabios-256k.json
install -D -m 0644 %{SOURCE15}
%{buildroot}%_datadir/%name/firmware/60-seabios-128k.json
+install -d -m 0755 %{buildroot}%_docdir/qemu-seabios
%else
for f in %{x86_extra_firmware} ; do
unlink %{buildroot}%_datadir/%name/$f
