Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2021-12-08 22:08:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Wed Dec 8 22:08:46 2021 rev:215 rq:936373 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2021-10-29 22:33:03.367655444 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new.31177/qemu.changes 2021-12-08 22:09:16.794871704 +0100 @@ -1,0 +2,12 @@ +Tue Dec 7 18:17:14 UTC 2021 - Dario Faggioli <[email protected]> + +* Patches added (bsc#1186256): + qemu-binfmt-conf.sh-allow-overriding-SUS.patch + +------------------------------------------------------------------- +Mon Dec 6 14:22:18 UTC 2021 - Guillaume GARDET <[email protected]> + +- cross-i386-binutils and cross-i386-gcc are not needed and were + dropped from Factory - boo#1193424 + +------------------------------------------------------------------- New: ---- qemu-binfmt-conf.sh-allow-overriding-SUS.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.3rt40v/_old 2021-12-08 22:09:19.426872940 +0100 +++ /var/tmp/diff_new_pack.3rt40v/_new 2021-12-08 22:09:19.434872943 +0100 @@ -196,6 +196,7 @@ Patch00061: vhost-vsock-fix-migration-issue-when-seq.patch Patch00062: block-introduce-max_hw_iov-for-use-in-sc.patch Patch00063: uas-add-stream-number-sanity-checks.patch +Patch00064: qemu-binfmt-conf.sh-allow-overriding-SUS.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -256,8 +257,6 @@ %if %{build_x86_firmware_from_source} %ifnarch %{ix86} x86_64 # We must cross-compile on non-x86* -BuildRequires: cross-i386-binutils -BuildRequires: cross-i386-gcc%gcc_version BuildRequires: cross-x86_64-binutils BuildRequires: cross-x86_64-gcc%gcc_version %endif @@ -1150,6 +1149,7 @@ %patch00061 -p1 %patch00062 -p1 %patch00063 -p1 +%patch00064 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 ++++++ bundles.tar.xz ++++++ Binary files old/f9baca549e44791be0dd98de15add3d8452a8af0.bundle and new/f9baca549e44791be0dd98de15add3d8452a8af0.bundle differ Binary files old/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.bundle and new/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.bundle differ Binary files old/roms/ipxe/4bd064de239dab2426b31c9789a1f4d78087dc63.bundle and new/roms/ipxe/4bd064de239dab2426b31c9789a1f4d78087dc63.bundle differ Binary files old/roms/qboot/a5300c4949b8d4de2d34bedfaed66793f48ec948.bundle and new/roms/qboot/a5300c4949b8d4de2d34bedfaed66793f48ec948.bundle differ Binary files old/roms/seabios/155821a1990b6de78dde5f98fa5ab90e802021e0.bundle and new/roms/seabios/155821a1990b6de78dde5f98fa5ab90e802021e0.bundle differ Binary files old/roms/sgabios/cbaee52287e5f32373181cff50a00b6c4ac9015a.bundle and new/roms/sgabios/cbaee52287e5f32373181cff50a00b6c4ac9015a.bundle differ ++++++ qemu-binfmt-conf.sh-allow-overriding-SUS.patch ++++++ From: Martin Wilck <[email protected]> Date: Wed, 19 May 2021 17:24:45 +0200 Subject: qemu-binfmt-conf.sh: allow overriding SUSE-specific argv[0] handling Git-commit: 0000000000000000000000000000000000000000 References: bsc#1186256 Since abbc0ce ("qemu-binfmt-conf: use qemu-ARCH-binfmt"), qemu-binfmt-conf.sh automatically replaces the default qemu binfmt wrapper qemu-$ARCH with qemu-$ARCH-binfmt in order to ensure that argv[0] is preserved; qemu-$ARCH-binfmt is a link to qemu-binfmt, which is just a simple wrapper that mangles argv to achieve the desired result. This is inconvenient in some situations. In particular for running foreign-arch containers, it's useful to use the binfmt_misc "F" ("fix binary") flag to pre-load the qemu wrapper in the kernel. That way, foreign-arch containers can be run just like native containers, without having to bind-mount interpreters into the container. But that's impossible with the SUSE binfmt wrapper that needs to exec() a different (native) executable. As the qemu-binfmt-conf script supports the --qemu-suffix option anyway, use it to set the "-binfmt" suffix, thus allowing admins to override the SUSE default with the option "--qemu-suffix ''". Signed-off-by: Martin Wilck <[email protected]> Acked-by: Jose R Ziviani <[email protected]> Signed-off-by: Dario Faggioli <[email protected]> --- scripts/qemu-binfmt-conf.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index a73232edfd7f9dedb3a7c32218fb..93e2c7c83fded06c598b8e844464 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -185,6 +185,7 @@ Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian][--systemd CPU] --help: display this usage --qemu-path: set path to qemu interpreter ($QEMU_PATH) --qemu-suffix: add a suffix to the default interpreter name + (default: "-binfmt") --debian: don't write into /proc, instead generate update-binfmts templates --systemd: don't write into /proc, @@ -316,9 +317,9 @@ qemu_set_binfmts() { continue fi - qemu="$QEMU_PATH/qemu-$cpu-binfmt" + qemu="$QEMU_PATH/qemu-$cpu" if [ "$cpu" = "i486" ] ; then - qemu="$QEMU_PATH/qemu-i386-binfmt" + qemu="$QEMU_PATH/qemu-i386" fi qemu="$qemu$QEMU_SUFFIX" @@ -338,7 +339,7 @@ QEMU_PATH=/usr/bin CREDENTIAL=no PERSISTENT=no PRESERVE_ARG0=no -QEMU_SUFFIX="" +QEMU_SUFFIX="-binfmt" options=$(getopt -o ds:Q:S:e:hc:p:g:F: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent:,preserve-argv0: -- "$@") eval set -- "$options" ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.3rt40v/_old 2021-12-08 22:09:19.930873175 +0100 +++ /var/tmp/diff_new_pack.3rt40v/_new 2021-12-08 22:09:19.934873177 +0100 @@ -172,8 +172,6 @@ %if %{build_x86_firmware_from_source} %ifnarch %{ix86} x86_64 # We must cross-compile on non-x86* -BuildRequires: cross-i386-binutils -BuildRequires: cross-i386-gcc%gcc_version BuildRequires: cross-x86_64-binutils BuildRequires: cross-x86_64-gcc%gcc_version %endif ++++++ vhost-vsock-fix-migration-issue-when-seq.patch ++++++ --- /var/tmp/diff_new_pack.3rt40v/_old 2021-12-08 22:09:20.062873237 +0100 +++ /var/tmp/diff_new_pack.3rt40v/_new 2021-12-08 22:09:20.062873237 +0100 @@ -56,10 +56,7 @@ { VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev); + VHostVSock *vsock = VHOST_VSOCK(vdev); - -- virtio_add_feature(&requested_features, VIRTIO_VSOCK_F_SEQPACKET); -- return vhost_get_features(&vvc->vhost_dev, feature_bits, -- requested_features); ++ + if (vsock->seqpacket != ON_OFF_AUTO_OFF) { + virtio_add_feature(&requested_features, VIRTIO_VSOCK_F_SEQPACKET); + } @@ -71,7 +68,10 @@ + !virtio_has_feature(requested_features, VIRTIO_VSOCK_F_SEQPACKET)) { + error_setg(errp, "vhost-vsock backend doesn't support seqpacket"); + } -+ + +- virtio_add_feature(&requested_features, VIRTIO_VSOCK_F_SEQPACKET); +- return vhost_get_features(&vvc->vhost_dev, feature_bits, +- requested_features); + return requested_features; }
