Accepting request 670650 from Virtualization

Add a few more fixes

OBS-URL: https://build.opensuse.org/request/show/670650
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qemu?expand=0&rev=150
This commit is contained in:
Stephan Kulow 2019-02-04 20:25:04 +00:00 committed by Git OBS Bridge
commit fd8a4f3c5f
16 changed files with 425 additions and 3 deletions

View File

@ -12,7 +12,7 @@ Message-Id: <20181212175817.815-1-ppandit@redhat.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
(cherry picked from commit cce648613bc802be1b894227f7fd94d88476ea07)
[BR: BSC#1119437]
[BR: BSC#1119437 CVE-2018-20123]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
hw/rdma/vmw/pvrdma_main.c | 3 ++-

View File

@ -12,7 +12,8 @@ Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
(cherry picked from commit 0e68373cc2b3a063ce067bc0cc3edaf370752890)
[BR: BSC#1119840, modified complete_work() calls to be comp_handler()]
[BR: BSC#1119840 CVE-2018-20124, modified complete_work() calls to be
comp_handler()]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
hw/rdma/rdma_backend.c | 8 ++++----

View File

@ -0,0 +1,68 @@
From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 8 Jan 2019 18:49:00 +0000
Subject: linux-user: make pwrite64/pread64(fd, NULL, 0, offset) return 0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Linux returns success if pwrite64() or pread64() are called with a
zero length NULL buffer, but QEMU was returning -TARGET_EFAULT.
This is the same bug that we fixed in commit 58cfa6c2e6eb51b23cc9
for the write syscall, and long before that in 38d840e6790c29f59
for the read syscall.
Fixes: https://bugs.launchpad.net/qemu/+bug/1810433
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190108184900.9654-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
(cherry picked from commit 2bd3f8998e1e7dcd9afc29fab252fb9936f9e956)
[LY: BSC#1121600]
Signed-off-by: Liang Yan <lyan@suse.com>
---
linux-user/syscall.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d978c67d6b..4d3b98c6f7 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -9723,8 +9723,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1,
arg4 = arg5;
arg5 = arg6;
}
- if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0)))
- return -TARGET_EFAULT;
+ if (arg2 == 0 && arg3 == 0) {
+ /* Special-case NULL buffer and zero length, which should succeed */
+ p = 0;
+ } else {
+ p = lock_user(VERIFY_WRITE, arg2, arg3, 0);
+ if (!p) {
+ return -TARGET_EFAULT;
+ }
+ }
ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
unlock_user(p, arg2, ret);
return ret;
@@ -9733,8 +9740,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1,
arg4 = arg5;
arg5 = arg6;
}
- if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1)))
- return -TARGET_EFAULT;
+ if (arg2 == 0 && arg3 == 0) {
+ /* Special-case NULL buffer and zero length, which should succeed */
+ p = 0;
+ } else {
+ p = lock_user(VERIFY_READ, arg2, arg3, 1);
+ if (!p) {
+ return -TARGET_EFAULT;
+ }
+ }
ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
unlock_user(p, arg2, 0);
return ret;

View File

@ -0,0 +1,31 @@
From: Bruce Rogers <brogers@suse.com>
Date: Thu, 17 Jan 2019 14:40:10 -0700
Subject: xen: Add xen v4.12 based xc_domain_create call
In xen v4.12, the xc_domain_create call parameters changed.
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
include/hw/xen/xen_common.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 93f631e5bf..42b088ae90 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -674,7 +674,15 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
xen_domain_handle_t handle, uint32_t flags,
uint32_t *pdomid)
{
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41200
return xc_domain_create(xc, ssidref, handle, flags, pdomid, NULL);
+#else
+ struct xen_domctl_createdomain create;
+ create.ssidref = ssidref;
+ memcpy(&(create.handle), handle, sizeof(xen_domain_handle_t));
+ create.flags = flags;
+ return xc_domain_create(xc, pdomid, &create);
+#endif
}
#endif
#endif

View File

@ -0,0 +1,33 @@
From: Prasad J Pandit <pjp@fedoraproject.org>
Date: Sun, 13 Jan 2019 23:29:48 +0530
Subject: slirp: check data length while emulating ident function
While emulating identification protocol, tcp_emu() does not check
available space in the 'sc_rcv->sb_data' buffer. It could lead to
heap buffer overflow issue. Add check to avoid it.
Reported-by: Kira <864786842@qq.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
(cherry picked from commit a7104eda7dab99d0cdbd3595c211864cba415905)
[BR: BSC#1123156 CVE-2019-6778, modify patch to use spaces instead of tabs]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
slirp/tcp_subr.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index fa61349cbb..7a23ce738c 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -635,6 +635,10 @@ tcp_emu(struct socket *so, struct mbuf *m)
socklen_t addrlen = sizeof(struct sockaddr_in);
struct sbuf *so_rcv = &so->so_rcv;
+ if (m->m_len > so_rcv->sb_datalen - (so_rcv->sb_wptr - so_rcv->sb_data)) {
+ return 1;
+ }
+
memcpy(so_rcv->sb_wptr, m->m_data, m->m_len);
so_rcv->sb_wptr += m->m_len;
so_rcv->sb_rptr += m->m_len;

View File

@ -0,0 +1,40 @@
From: Janosch Frank <frankja@linux.ibm.com>
Date: Fri, 11 Jan 2019 12:36:57 +0100
Subject: s390x: Return specification exception for unimplemented diag 308
subcodes
The architecture specifies specification exceptions for all
unavailable subcodes.
The presence of subcodes is indicated by checking some query subcode.
For example 6 will indicate that 3-6 are available. So future systems
might call new subcodes to check for new features. This should not
trigger a hw error, instead we return the architectured specification
exception.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Cc: qemu-stable@nongnu.org
Message-Id: <20190111113657.66195-3-frankja@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
(cherry picked from commit 37dbd1f4d4805edcd18d94eb202bb3461b3cd52d)
[LY: BSC#1123179]
Signed-off-by: Liang Yan <lyan@suse.com>
---
target/s390x/diag.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index acb0f3d4af..aafa740f61 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -130,7 +130,7 @@ out:
}
return;
default:
- hw_error("Unhandled diag308 subcode %" PRIx64, subcode);
+ s390_program_interrupt(env, PGM_SPECIFICATION, ILEN_AUTO, ra);
break;
}
}

View File

@ -38,7 +38,7 @@
</conditions>
<hardware>
<memory>
<size unit="M">3600</size>
<size unit="M">4000</size>
</memory>
</hardware>
</overwrite>

View File

@ -0,0 +1,42 @@
From 0ee72a15887b838d967c3b05070d5ad86f0d729a Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Fri, 25 Jan 2019 10:29:16 -0700
Subject: [PATCH] [build] Disable gcc address of packed member warning
GCC 9.0 introduces a new warning for using pointers to packed
structure and union members. ipxe code is replete with this usage,
partly because the architectures it is designed for handle unaligned
accesses. Therefore this warning is not very helpful and since the
default build considers warnings to be errors, needs to be disabled.
[BR: BSC#1121464]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
src/Makefile.housekeeping | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index f8334921..e7f1ece0 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -646,6 +646,17 @@ $(BIN)/.certificate.der.% : $(BIN)/.cert
CERT_ALL := $(foreach i,$(call seq,1,$(CERT_COUNT)),\
CERT ( $(i), \"$(word $(i),$(CERT_DERS))\" ))
+
+# GCC 9.0 introduces a new warning for using pointers to packed
+# structure and union members. ipxe code is replete with this usage,
+# partly because the architectures it is designed for handle unaligned
+# accesses. Therefore this warning is not very helpful and since the
+# default build considers warnings to be errors, needs to be disabled.
+#
+WNAOPM_TEST = $(CC) -Waddress-of-packed-member -x c -c /dev/null -o /dev/null \
+ >/dev/null 2>&1
+WNAOPM_FLAGS := $(shell $(WNAOPM_TEST) && $(ECHO) '-Wno-address-of-packed-member')
+WORKAROUND_CFLAGS += $(WNAOPM_FLAGS)
endif
certstore_DEPS += $(CERT_LIST) $(CERT_FILES) $(CERT_PEMS) $(CERT_DERS)
--
2.20.1

View File

@ -0,0 +1,42 @@
From 1280c1f65b73d6d0c4833e39a3bb8194bd03f906 Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Fri, 25 Jan 2019 09:37:44 -0700
Subject: [PATCH] [efi] Simplify diagnostic for NULL handle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Compiling with GCC 9 now warns as follows:
interface/efi/efi_debug.c:334:3: error: %s directive argument is null [-Werror=format-overflow=]
334 | printf ( "HANDLE %s could not retrieve protocols\n",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
335 | efi_handle_name ( handle ) );
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Simplify this diagnostic by simply indicating a <NULL> has been
passed as a handle.
[BR: BSC#1121464]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
src/interface/efi/efi_debug.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/interface/efi/efi_debug.c b/src/interface/efi/efi_debug.c
index 8ea0a822..19fba767 100644
--- a/src/interface/efi/efi_debug.c
+++ b/src/interface/efi/efi_debug.c
@@ -331,8 +331,7 @@ void dbg_efi_protocols ( EFI_HANDLE handle ) {
/* Sanity check */
if ( ! handle ) {
- printf ( "HANDLE %s could not retrieve protocols\n",
- efi_handle_name ( handle ) );
+ printf ( "HANDLE <NULL> could not retrieve protocols\n" );
return;
}
--
2.20.1

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Wed Jan 30 15:54:31 UTC 2019 - Liang Yan <lyan@suse.com>
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
* Patches added:
0057-s390x-Return-specification-exceptio.patch
-------------------------------------------------------------------
Fri Jan 25 19:21:00 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
* Patches added:
0056-slirp-check-data-length-while-emula.patch
-------------------------------------------------------------------
Thu Jan 17 21:58:04 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
* Patches added:
0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
-------------------------------------------------------------------
Tue Jan 15 13:58:26 UTC 2019 - Liang Yan <lyan@suse.com>
- Fix pwrite64/pread64 to return 0 over -1 for a
zero length NULL buffer in qemu (bsc#1121600)
0054-linux-user-make-pwrite64-pread64-fd.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
-------------------------------------------------------------------
Thu Jan 10 18:03:30 UTC 2019 - Bruce Rogers <brogers@suse.com>

View File

@ -85,6 +85,10 @@ Patch0050: 0050-pvrdma-check-number-of-pages-when-c.patch
Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
Patch0056: 0056-slirp-check-data-length-while-emula.patch
Patch0057: 0057-s390x-Return-specification-exceptio.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
ExcludeArch: s390
@ -169,6 +173,10 @@ syscall layer occurs on the native hardware and operating system.
%patch0051 -p1
%patch0052 -p1
%patch0053 -p1
%patch0054 -p1
%patch0055 -p1
%patch0056 -p1
%patch0057 -p1
%build
./configure \

View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Fri Feb 1 23:34:52 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Increase memory needed to build qemu-testsuite for ppc* arch's
in _constraints file
-------------------------------------------------------------------
Wed Jan 30 15:54:30 UTC 2019 - Liang Yan <lyan@suse.com>
- Return specification exception for unimplemented diag 308 subcodes
rather than a hardware error (bsc#1123179)
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
* Patches added:
0057-s390x-Return-specification-exceptio.patch
-------------------------------------------------------------------
Fri Jan 25 19:20:59 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Fix OOB issue in slirp (CVE-2019-6778 bsc#1123156)
0056-slirp-check-data-length-while-emula.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
- Fix ipxe GCC 9 incompatibilities (bsc#1121464)
ipxe-efi-Simplify-diagnostic-for-NULL-handle.patch
ipxe-build-Disable-gcc-address-of-packed-member-warning.patch
-------------------------------------------------------------------
Thu Jan 17 21:58:02 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Tweak Xen interface to be compatible with upcoming v4.12 Xen
0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
-------------------------------------------------------------------
Tue Jan 15 13:58:25 UTC 2019 - Liang Yan <lyan@suse.com>
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
* Patches added:
0054-linux-user-make-pwrite64-pread64-fd.patch
(bsc#1121600)
-------------------------------------------------------------------
Mon Jan 14 16:15:37 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Clarify that move to include v3.1.0 in qemu package corresponds
with fate#327089, which of course builds on v3.0.0 mentioned
previously, and that among other patches which this change
obsoletes (because functionality is included in base version) I
will mention one pointed out by reviewers:
0094-s390x-cpumodels-add-z14-Model-ZR1.patch
-------------------------------------------------------------------
Thu Jan 10 18:03:29 UTC 2019 - Bruce Rogers <brogers@suse.com>

View File

@ -190,6 +190,10 @@ Patch0050: 0050-pvrdma-check-number-of-pages-when-c.patch
Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
Patch0056: 0056-slirp-check-data-length-while-emula.patch
Patch0057: 0057-s390x-Return-specification-exceptio.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@ -202,6 +206,8 @@ Patch1200: ipxe-stable-buildid.patch
Patch1201: ipxe-use-gcc6-for-more-compact-code.patch
Patch1202: ipxe-efi-guard-strncpy-with-gcc-warning-ignore-pragma.patch
Patch1203: ipxe-fix-build.patch
Patch1204: ipxe-efi-Simplify-diagnostic-for-NULL-handle.patch
Patch1205: ipxe-build-Disable-gcc-address-of-packed-member-warning.patch
# sgabios - path: roms/sgabios (patch range 1300-1399)
Patch1300: sgabios-stable-buildid.patch
@ -971,6 +977,10 @@ This package provides a service file for starting and stopping KSM.
%patch0051 -p1
%patch0052 -p1
%patch0053 -p1
%patch0054 -p1
%patch0055 -p1
%patch0056 -p1
%patch0057 -p1
pushd roms/seabios
%patch1100 -p1
@ -986,6 +996,8 @@ pushd roms/ipxe
%endif
%patch1202 -p1
%patch1203 -p1
%patch1204 -p1
%patch1205 -p1
popd
pushd roms/sgabios

View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Fri Feb 1 23:34:52 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Increase memory needed to build qemu-testsuite for ppc* arch's
in _constraints file
-------------------------------------------------------------------
Wed Jan 30 15:54:30 UTC 2019 - Liang Yan <lyan@suse.com>
- Return specification exception for unimplemented diag 308 subcodes
rather than a hardware error (bsc#1123179)
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
* Patches added:
0057-s390x-Return-specification-exceptio.patch
-------------------------------------------------------------------
Fri Jan 25 19:20:59 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Fix OOB issue in slirp (CVE-2019-6778 bsc#1123156)
0056-slirp-check-data-length-while-emula.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
- Fix ipxe GCC 9 incompatibilities (bsc#1121464)
ipxe-efi-Simplify-diagnostic-for-NULL-handle.patch
ipxe-build-Disable-gcc-address-of-packed-member-warning.patch
-------------------------------------------------------------------
Thu Jan 17 21:58:02 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Tweak Xen interface to be compatible with upcoming v4.12 Xen
0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
-------------------------------------------------------------------
Tue Jan 15 13:58:25 UTC 2019 - Liang Yan <lyan@suse.com>
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
* Patches added:
0054-linux-user-make-pwrite64-pread64-fd.patch
(bsc#1121600)
-------------------------------------------------------------------
Mon Jan 14 16:15:37 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Clarify that move to include v3.1.0 in qemu package corresponds
with fate#327089, which of course builds on v3.0.0 mentioned
previously, and that among other patches which this change
obsoletes (because functionality is included in base version) I
will mention one pointed out by reviewers:
0094-s390x-cpumodels-add-z14-Model-ZR1.patch
-------------------------------------------------------------------
Thu Jan 10 18:03:29 UTC 2019 - Bruce Rogers <brogers@suse.com>

View File

@ -190,6 +190,10 @@ Patch0050: 0050-pvrdma-check-number-of-pages-when-c.patch
Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
Patch0056: 0056-slirp-check-data-length-while-emula.patch
Patch0057: 0057-s390x-Return-specification-exceptio.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@ -202,6 +206,8 @@ Patch1200: ipxe-stable-buildid.patch
Patch1201: ipxe-use-gcc6-for-more-compact-code.patch
Patch1202: ipxe-efi-guard-strncpy-with-gcc-warning-ignore-pragma.patch
Patch1203: ipxe-fix-build.patch
Patch1204: ipxe-efi-Simplify-diagnostic-for-NULL-handle.patch
Patch1205: ipxe-build-Disable-gcc-address-of-packed-member-warning.patch
# sgabios - path: roms/sgabios (patch range 1300-1399)
Patch1300: sgabios-stable-buildid.patch
@ -971,6 +977,10 @@ This package provides a service file for starting and stopping KSM.
%patch0051 -p1
%patch0052 -p1
%patch0053 -p1
%patch0054 -p1
%patch0055 -p1
%patch0056 -p1
%patch0057 -p1
pushd roms/seabios
%patch1100 -p1
@ -986,6 +996,8 @@ pushd roms/ipxe
%endif
%patch1202 -p1
%patch1203 -p1
%patch1204 -p1
%patch1205 -p1
popd
pushd roms/sgabios

View File

@ -147,6 +147,8 @@ Patch1200: ipxe-stable-buildid.patch
Patch1201: ipxe-use-gcc6-for-more-compact-code.patch
Patch1202: ipxe-efi-guard-strncpy-with-gcc-warning-ignore-pragma.patch
Patch1203: ipxe-fix-build.patch
Patch1204: ipxe-efi-Simplify-diagnostic-for-NULL-handle.patch
Patch1205: ipxe-build-Disable-gcc-address-of-packed-member-warning.patch
# sgabios - path: roms/sgabios (patch range 1300-1399)
Patch1300: sgabios-stable-buildid.patch
@ -879,6 +881,8 @@ pushd roms/ipxe
%endif
%patch1202 -p1
%patch1203 -p1
%patch1204 -p1
%patch1205 -p1
popd
pushd roms/sgabios