7325eaecfb
- Include upstream patches targeted for the next stable release (bug fixes only) spapr-Fix-failure-path-for-attempting-to.patch target-i386-do-not-set-unsupported-VMX-s.patch target-xtensa-fix-pasto-in-pfwait.r-opco.patch tcg-i386-Fix-INDEX_op_dup2_vec.patch tcg-mips-mips-sync-encode-error.patch vhost-user-gpu-Release-memory-returned-b.patch vpc-Don-t-round-up-already-aligned-BAT-s.patch xen-block-Fix-double-qlist-remove-and-re.patch - Fix bug causing weak encryption in PAuth for ARM (CVE-2020-10702 bsc#1168681) target-arm-Fix-PAuth-sbox-functions.patch - Fix OOB in tulip NIC emulation (CVE-2020-11102 bsc#1168713 net-tulip-check-frame-size-and-r-w-data-.patch - Note that previously included patch addresses CVE-2020-1711 and bsc#1166240 iscsi-Cap-block-count-from-GET-LBA-STATU.patch - Include performance improvement (and related?) patch aio-wait-delegate-polling-of-main-AioCon.patch async-use-explicit-memory-barriers.patch - Rework previous patch at Olaf H.'s direction hw-i386-disable-smbus-migration-for-xenf.patch - Eliminate is_opensuse usage in producing seabios version string what we are doing here is just replacing the upstream string with one indicating that the openSUSE build service built it, and so just leave it as "-rebuilt.opensuse.org" - Alter algorithm used to produce "unique" symbol for coordinating qemu with the optional modules it may load. This is a reasonable relaxation for broader compatibility configure-remove-pkgversion-from-CONFIG_.patch - Tweak supported.*.txt for latest deprecations, and other fixes - Tweak update_git.sh, config.sh - One more fix is needed for: s390x Protected Virtualization support - start and control guest in secure mode (bsc#1167075 jsc#SLE-7407) s390x-s390-virtio-ccw-Fix-build-on-syste.patch OBS-URL: https://build.opensuse.org/request/show/795118 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=542
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Fri, 17 Apr 2020 13:07:37 -0600
|
|
Subject: configure: remove $pkgversion from CONFIG_STAMP input to broaden
|
|
compatibility
|
|
|
|
As part of the effort to close the gap with Leap I think we are fine
|
|
removing the $pkgversion component to creating a unique CONFIG_STAMP.
|
|
This stamp is only used in creating a unique symbol used in ensuring the
|
|
dynamically loaded modules correspond correctly to the loading qemu.
|
|
The default inputs to producing this unique symbol are somewhat reasonable
|
|
as a generic mechanism, but specific packaging and maintenance practices
|
|
might require the default to be modified for best use. This is an example
|
|
of that.
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
configure | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 94984691ab378620ac2e0ae771ca..c68e378776336748b227013a1a3f 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6811,7 +6811,7 @@ fi
|
|
if test "$modules" = "yes"; then
|
|
# $shacmd can generate a hash started with digit, which the compiler doesn't
|
|
# like as an symbol. So prefix it with an underscore
|
|
- echo "CONFIG_STAMP=_$( (echo $qemu_version; echo $pkgversion; cat $0) | $shacmd - | cut -f1 -d\ )" >> $config_host_mak
|
|
+ echo "CONFIG_STAMP=_$( (echo $qemu_version; cat $0) | $shacmd - | cut -f1 -d\ )" >> $config_host_mak
|
|
echo "CONFIG_MODULES=y" >> $config_host_mak
|
|
fi
|
|
if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then
|