Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] qemu(-user-static): update to 7.1.0.
@ 2022-09-03 12:16 unspecd
  2022-09-29 23:06 ` [PR PATCH] [Updated] " unspecd
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: unspecd @ 2022-09-03 12:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]

There is a new pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/qemu
https://github.com/void-linux/void-packages/pull/39086

qemu(-user-static): update to 7.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ppc64le-musl

### Changes
- `configure_args`:
   - https://github.com/qemu/qemu/commit/95f8510ef428f988897176b9585b8ba1432f939f
- `makedepends`:
   - https://github.com/qemu/qemu/commit/83602083b4ada6ceb86bfb327e83556ebab120fc
- fix-compat-glibc-2.36.patch:
   - https://github.com/qemu/qemu/commit/3cd3df2a9584e6f753bb62a0028bd67124ab5532
-  xxx-ppcle.patch:
   - https://github.com/qemu/qemu/commit/cd362defbbd09cbbc08b3bb465141542887b8cef
   - https://github.com/qemu/qemu/commit/ee3eb3a7ce7242735e6fd64cad53482e3df5a5ec

https://wiki.qemu.org/ChangeLog/7.1


A patch file from https://github.com/void-linux/void-packages/pull/39086.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/qemu-39086.patch --]
[-- Type: text/x-diff, Size: 10724 bytes --]

From 98c160825aab7011ed2a28cde932ec2b66c9c540 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 3 Sep 2022 19:29:11 +1100
Subject: [PATCH 1/2] qemu: update to 7.1.0.

---
 .../qemu/patches/fix-compat-glibc-2.36.patch  | 100 ------------------
 srcpkgs/qemu/patches/xxx-ppcle.patch          |  34 +++---
 srcpkgs/qemu/template                         |  10 +-
 3 files changed, 25 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch

diff --git a/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch b/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch
deleted file mode 100644
index e7239ad06313..000000000000
--- a/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3cd3df2a9584e6f753bb62a0028bd67124ab5532 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 2 Aug 2022 12:41:34 -0400
-Subject: [PATCH] linux-user: fix compat with glibc >= 2.36 sys/mount.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The latest glibc 2.36 has extended sys/mount.h so that it
-defines the FSCONFIG_* enum constants. These are historically
-defined in linux/mount.h, and thus if you include both headers
-the compiler complains:
-
-In file included from /usr/include/linux/fs.h:19,
-                 from ../linux-user/syscall.c:98:
-/usr/include/linux/mount.h:95:6: error: redeclaration of 'enum fsconfig_command'
-   95 | enum fsconfig_command {
-      |      ^~~~~~~~~~~~~~~~
-In file included from ../linux-user/syscall.c:31:
-/usr/include/sys/mount.h:189:6: note: originally defined here
-  189 | enum fsconfig_command
-      |      ^~~~~~~~~~~~~~~~
-/usr/include/linux/mount.h:96:9: error: redeclaration of enumerator 'FSCONFIG_SET_FLAG'
-   96 |         FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
-      |         ^~~~~~~~~~~~~~~~~
-/usr/include/sys/mount.h:191:3: note: previous definition of 'FSCONFIG_SET_FLAG' with type 'enum fsconfig_command'
-  191 |   FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
-      |   ^~~~~~~~~~~~~~~~~
-...snip...
-
-QEMU doesn't include linux/mount.h, but it does use
-linux/fs.h and thus gets linux/mount.h indirectly.
-
-glibc acknowledges this problem but does not appear to
-be intending to fix it in the forseeable future, simply
-documenting it as a known incompatibility with no
-workaround:
-
-  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-  https://sourceware.org/glibc/wiki/Synchronizing_Headers
-
-To address this requires either removing use of sys/mount.h
-or linux/fs.h, despite QEMU needing declarations from
-both.
-
-This patch removes linux/fs.h, meaning we have to define
-various FS_IOC constants that are now unavailable.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Tested-by: Richard W.M. Jones <rjones@redhat.com>
-Message-Id: <20220802164134.1851910-1-berrange@redhat.com>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
----
- linux-user/syscall.c | 18 ++++++++++++++++++
- meson.build          |  2 ++
- 2 files changed, 20 insertions(+)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index ef53feb5ab45..f4091212027c 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -95,7 +95,25 @@
- #include <linux/soundcard.h>
- #include <linux/kd.h>
- #include <linux/mtio.h>
-+
-+#ifdef HAVE_SYS_MOUNT_FSCONFIG
-+/*
-+ * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
-+ * which in turn prevents use of linux/fs.h. So we have to
-+ * define the constants ourselves for now.
-+ */
-+#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
-+#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
-+#define FS_IOC_GETVERSION              _IOR('v', 1, long)
-+#define FS_IOC_SETVERSION              _IOW('v', 2, long)
-+#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
-+#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
-+#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
-+#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
-+#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
-+#else
- #include <linux/fs.h>
-+#endif
- #include <linux/fd.h>
- #if defined(CONFIG_FIEMAP)
- #include <linux/fiemap.h>
-diff --git a/meson.build b/meson.build
-index 294e9a8f329e..30a380752c0d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1963,6 +1963,8 @@ config_host_data.set('HAVE_OPTRESET',
-                      cc.has_header_symbol('getopt.h', 'optreset'))
- config_host_data.set('HAVE_IPPROTO_MPTCP',
-                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
-+config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
-+                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
- 
- # has_member
- config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
diff --git a/srcpkgs/qemu/patches/xxx-ppcle.patch b/srcpkgs/qemu/patches/xxx-ppcle.patch
index 7418ca8d2c63..90b32b5e07cd 100644
--- a/srcpkgs/qemu/patches/xxx-ppcle.patch
+++ b/srcpkgs/qemu/patches/xxx-ppcle.patch
@@ -57,7 +57,7 @@ index b9c4b81..cf26497 100644
  #define UNAME_MACHINE "ppc64le"
  #endif
  #else
-+#ifdef TARGET_WORDS_BIGENDIAN
++#if TARGET_BIG_ENDIAN
  #define UNAME_MACHINE "ppc"
 +#else
 +#define UNAME_MACHINE "ppcle"
@@ -89,19 +89,25 @@ index 9f1580a..393943f 100755
          echo "ppcle"
          ;;
      arm|armel|armhf|arm64|armv[4-9]*l|aarch64)
-diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
-index e1b70e2..e07f5fe 100755
---- a/tests/tcg/configure.sh
-+++ b/tests/tcg/configure.sh
-@@ -59,6 +59,8 @@ fi
- : $(cross_cc_mips="mips-linux-gnu-gcc")
- : ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
- : ${cross_cc_cflags_ppc="-m32"}
-+: ${cross_cc_ppcle="powerpcle-linux-gnu-gcc"}
+diff --git a/configure b/configure
+index 72ab03f11a..0691929d76 100755
+--- a/configure
++++ b/configure
+@@ -1866,6 +1866,7 @@ fi
+ : ${cross_prefix_mips="mips-linux-gnu-"}
+ : ${cross_prefix_nios2="nios2-linux-gnu-"}
+ : ${cross_prefix_ppc="powerpc-linux-gnu-"}
++: ${cross_prefix_ppcle="powerpcle-linux-gnu-"}
+ : ${cross_prefix_ppc64="powerpc64-linux-gnu-"}
+ : ${cross_prefix_ppc64le="$cross_prefix_ppc64"}
+ : ${cross_prefix_riscv64="riscv64-linux-gnu-"}
+@@ -1883,6 +1884,7 @@ fi
+ : ${cross_cc_cflags_hexagon="-mv67 -O2 -static"}
+ : ${cross_cc_cflags_i386="-m32"}
+ : ${cross_cc_cflags_ppc="-m32 -mbig-endian"}
 +: ${cross_cc_cflags_ppcle="-m32"}
- : ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"}
- : ${cross_cc_ppc64le="powerpc64le-linux-gnu-gcc"}
- : $(cross_cc_riscv64="riscv64-linux-gnu-gcc")
--- 
+ : ${cross_cc_cflags_ppc64="-m64 -mbig-endian"}
+ : ${cross_cc_ppc64le="$cross_cc_ppc64"}
+ : ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"}
 2.30.1
 
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b851a51b064d..b19ccffa0bab 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,18 +1,18 @@
 # Template file for 'qemu'
 # This package should be updated together with qemu-user-static
 pkgname=qemu
-version=7.0.0
+version=7.1.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
  --disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
- --enable-snappy --enable-tpm --enable-usb-redir --enable-vhost-net --enable-virtfs --enable-vnc-png
+ --enable-snappy --enable-tpm --enable-usb-redir --enable-vhost-net --enable-virtfs --enable-png
  --audio-drv-list=alsa$(vopt_if sdl2 ,sdl)$(vopt_if jack ,jack)$(vopt_if pulseaudio ,pa)
  $(vopt_enable opengl) $(vopt_enable pulseaudio pa) $(vopt_enable sdl2 sdl) $(vopt_enable smartcard)
  $(vopt_enable spice) $(vopt_enable virgl virglrenderer) $(vopt_if gtk3 '--enable-gtk')"
 hostmakedepends="gettext pkg-config perl python3 python3-Sphinx python3-sphinx_rtd_theme ninja"
-makedepends="dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel
- libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
+makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel
+ snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
  libsasl-devel libglib-devel ncurses-devel libseccomp-devel nss-devel
  libcurl-devel xfsprogs-devel libcap-ng-devel vde2-devel usbredir-devel
  libbluetooth-devel libssh2-devel libusb-devel libnfs-devel libslirp-devel
@@ -28,7 +28,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
+checksum=f7ac2b85b3f1831e6810b140306e30af91556e15784864b209f3942858947fd0
 ignore_elf_dirs="/usr/share/qemu"
 nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
  palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf

From 39623a0dbca9f9bc85ffcaa374202365a148477f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 3 Sep 2022 19:29:34 +1100
Subject: [PATCH 2/2] qemu-user-static: update to 7.1.0.

---
 srcpkgs/qemu-user-static/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 34de456db4a9..95807f05ae7e 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,12 +1,12 @@
 # Template file for 'qemu-user-static'
 # This package should be updated together with qemu
 pkgname=qemu-user-static
-version=7.0.0
+version=7.1.0
 revision=1
 wrksrc="qemu-${version}"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
- --disable-kvm --disable-vnc-png --disable-virtfs --disable-fdt --disable-seccomp
+ --disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
  --enable-linux-user --disable-system --static"
 hostmakedepends="pkg-config perl python3 ninja"
 makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
+checksum=f7ac2b85b3f1831e6810b140306e30af91556e15784864b209f3942858947fd0
 
 _fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
  microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] qemu(-user-static): update to 7.1.0.
  2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
@ 2022-09-29 23:06 ` unspecd
  2022-09-29 23:09 ` unspecd
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: unspecd @ 2022-09-29 23:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/qemu
https://github.com/void-linux/void-packages/pull/39086

qemu(-user-static): update to 7.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ppc64le-musl

### Changes
- `configure_args`:
   - https://github.com/qemu/qemu/commit/95f8510ef428f988897176b9585b8ba1432f939f
- `makedepends`:
   - https://github.com/qemu/qemu/commit/83602083b4ada6ceb86bfb327e83556ebab120fc
- fix-compat-glibc-2.36.patch:
   - https://github.com/qemu/qemu/commit/3cd3df2a9584e6f753bb62a0028bd67124ab5532
-  xxx-ppcle.patch:
   - https://github.com/qemu/qemu/commit/cd362defbbd09cbbc08b3bb465141542887b8cef
   - https://github.com/qemu/qemu/commit/ee3eb3a7ce7242735e6fd64cad53482e3df5a5ec

https://wiki.qemu.org/ChangeLog/7.1


A patch file from https://github.com/void-linux/void-packages/pull/39086.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/qemu-39086.patch --]
[-- Type: text/x-diff, Size: 10738 bytes --]

From 1e35ef43957aeecf5bfb34d5ded65076459d32f7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 3 Sep 2022 19:29:11 +1100
Subject: [PATCH 1/2] qemu: update to 7.1.0.

---
 .../qemu/patches/fix-compat-glibc-2.36.patch  | 100 ------------------
 srcpkgs/qemu/patches/xxx-ppcle.patch          |  34 +++---
 srcpkgs/qemu/template                         |  10 +-
 3 files changed, 25 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch

diff --git a/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch b/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch
deleted file mode 100644
index e7239ad06313..000000000000
--- a/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3cd3df2a9584e6f753bb62a0028bd67124ab5532 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 2 Aug 2022 12:41:34 -0400
-Subject: [PATCH] linux-user: fix compat with glibc >= 2.36 sys/mount.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The latest glibc 2.36 has extended sys/mount.h so that it
-defines the FSCONFIG_* enum constants. These are historically
-defined in linux/mount.h, and thus if you include both headers
-the compiler complains:
-
-In file included from /usr/include/linux/fs.h:19,
-                 from ../linux-user/syscall.c:98:
-/usr/include/linux/mount.h:95:6: error: redeclaration of 'enum fsconfig_command'
-   95 | enum fsconfig_command {
-      |      ^~~~~~~~~~~~~~~~
-In file included from ../linux-user/syscall.c:31:
-/usr/include/sys/mount.h:189:6: note: originally defined here
-  189 | enum fsconfig_command
-      |      ^~~~~~~~~~~~~~~~
-/usr/include/linux/mount.h:96:9: error: redeclaration of enumerator 'FSCONFIG_SET_FLAG'
-   96 |         FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
-      |         ^~~~~~~~~~~~~~~~~
-/usr/include/sys/mount.h:191:3: note: previous definition of 'FSCONFIG_SET_FLAG' with type 'enum fsconfig_command'
-  191 |   FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
-      |   ^~~~~~~~~~~~~~~~~
-...snip...
-
-QEMU doesn't include linux/mount.h, but it does use
-linux/fs.h and thus gets linux/mount.h indirectly.
-
-glibc acknowledges this problem but does not appear to
-be intending to fix it in the forseeable future, simply
-documenting it as a known incompatibility with no
-workaround:
-
-  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-  https://sourceware.org/glibc/wiki/Synchronizing_Headers
-
-To address this requires either removing use of sys/mount.h
-or linux/fs.h, despite QEMU needing declarations from
-both.
-
-This patch removes linux/fs.h, meaning we have to define
-various FS_IOC constants that are now unavailable.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Tested-by: Richard W.M. Jones <rjones@redhat.com>
-Message-Id: <20220802164134.1851910-1-berrange@redhat.com>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
----
- linux-user/syscall.c | 18 ++++++++++++++++++
- meson.build          |  2 ++
- 2 files changed, 20 insertions(+)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index ef53feb5ab45..f4091212027c 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -95,7 +95,25 @@
- #include <linux/soundcard.h>
- #include <linux/kd.h>
- #include <linux/mtio.h>
-+
-+#ifdef HAVE_SYS_MOUNT_FSCONFIG
-+/*
-+ * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
-+ * which in turn prevents use of linux/fs.h. So we have to
-+ * define the constants ourselves for now.
-+ */
-+#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
-+#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
-+#define FS_IOC_GETVERSION              _IOR('v', 1, long)
-+#define FS_IOC_SETVERSION              _IOW('v', 2, long)
-+#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
-+#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
-+#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
-+#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
-+#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
-+#else
- #include <linux/fs.h>
-+#endif
- #include <linux/fd.h>
- #if defined(CONFIG_FIEMAP)
- #include <linux/fiemap.h>
-diff --git a/meson.build b/meson.build
-index 294e9a8f329e..30a380752c0d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1963,6 +1963,8 @@ config_host_data.set('HAVE_OPTRESET',
-                      cc.has_header_symbol('getopt.h', 'optreset'))
- config_host_data.set('HAVE_IPPROTO_MPTCP',
-                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
-+config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
-+                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
- 
- # has_member
- config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
diff --git a/srcpkgs/qemu/patches/xxx-ppcle.patch b/srcpkgs/qemu/patches/xxx-ppcle.patch
index 7418ca8d2c63..90b32b5e07cd 100644
--- a/srcpkgs/qemu/patches/xxx-ppcle.patch
+++ b/srcpkgs/qemu/patches/xxx-ppcle.patch
@@ -57,7 +57,7 @@ index b9c4b81..cf26497 100644
  #define UNAME_MACHINE "ppc64le"
  #endif
  #else
-+#ifdef TARGET_WORDS_BIGENDIAN
++#if TARGET_BIG_ENDIAN
  #define UNAME_MACHINE "ppc"
 +#else
 +#define UNAME_MACHINE "ppcle"
@@ -89,19 +89,25 @@ index 9f1580a..393943f 100755
          echo "ppcle"
          ;;
      arm|armel|armhf|arm64|armv[4-9]*l|aarch64)
-diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
-index e1b70e2..e07f5fe 100755
---- a/tests/tcg/configure.sh
-+++ b/tests/tcg/configure.sh
-@@ -59,6 +59,8 @@ fi
- : $(cross_cc_mips="mips-linux-gnu-gcc")
- : ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
- : ${cross_cc_cflags_ppc="-m32"}
-+: ${cross_cc_ppcle="powerpcle-linux-gnu-gcc"}
+diff --git a/configure b/configure
+index 72ab03f11a..0691929d76 100755
+--- a/configure
++++ b/configure
+@@ -1866,6 +1866,7 @@ fi
+ : ${cross_prefix_mips="mips-linux-gnu-"}
+ : ${cross_prefix_nios2="nios2-linux-gnu-"}
+ : ${cross_prefix_ppc="powerpc-linux-gnu-"}
++: ${cross_prefix_ppcle="powerpcle-linux-gnu-"}
+ : ${cross_prefix_ppc64="powerpc64-linux-gnu-"}
+ : ${cross_prefix_ppc64le="$cross_prefix_ppc64"}
+ : ${cross_prefix_riscv64="riscv64-linux-gnu-"}
+@@ -1883,6 +1884,7 @@ fi
+ : ${cross_cc_cflags_hexagon="-mv67 -O2 -static"}
+ : ${cross_cc_cflags_i386="-m32"}
+ : ${cross_cc_cflags_ppc="-m32 -mbig-endian"}
 +: ${cross_cc_cflags_ppcle="-m32"}
- : ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"}
- : ${cross_cc_ppc64le="powerpc64le-linux-gnu-gcc"}
- : $(cross_cc_riscv64="riscv64-linux-gnu-gcc")
--- 
+ : ${cross_cc_cflags_ppc64="-m64 -mbig-endian"}
+ : ${cross_cc_ppc64le="$cross_cc_ppc64"}
+ : ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"}
 2.30.1
 
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b851a51b064d..b19ccffa0bab 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,18 +1,18 @@
 # Template file for 'qemu'
 # This package should be updated together with qemu-user-static
 pkgname=qemu
-version=7.0.0
+version=7.1.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
  --disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
- --enable-snappy --enable-tpm --enable-usb-redir --enable-vhost-net --enable-virtfs --enable-vnc-png
+ --enable-snappy --enable-tpm --enable-usb-redir --enable-vhost-net --enable-virtfs --enable-png
  --audio-drv-list=alsa$(vopt_if sdl2 ,sdl)$(vopt_if jack ,jack)$(vopt_if pulseaudio ,pa)
  $(vopt_enable opengl) $(vopt_enable pulseaudio pa) $(vopt_enable sdl2 sdl) $(vopt_enable smartcard)
  $(vopt_enable spice) $(vopt_enable virgl virglrenderer) $(vopt_if gtk3 '--enable-gtk')"
 hostmakedepends="gettext pkg-config perl python3 python3-Sphinx python3-sphinx_rtd_theme ninja"
-makedepends="dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel
- libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
+makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel
+ snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
  libsasl-devel libglib-devel ncurses-devel libseccomp-devel nss-devel
  libcurl-devel xfsprogs-devel libcap-ng-devel vde2-devel usbredir-devel
  libbluetooth-devel libssh2-devel libusb-devel libnfs-devel libslirp-devel
@@ -28,7 +28,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
+checksum=f7ac2b85b3f1831e6810b140306e30af91556e15784864b209f3942858947fd0
 ignore_elf_dirs="/usr/share/qemu"
 nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
  palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf

From 8ea42c7f9d4369f403742bd4dd5888feb01bd4b0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 3 Sep 2022 19:29:34 +1100
Subject: [PATCH 2/2] qemu-user-static: update to 7.1.0.

---
 srcpkgs/qemu-user-static/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 4709d6ac8a3f..c58e58f9cd93 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,12 +1,12 @@
 # Template file for 'qemu-user-static'
 # This package should be updated together with qemu
 pkgname=qemu-user-static
-version=7.0.0
-revision=2
+version=7.1.0
+revision=1
 wrksrc="qemu-${version}"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
- --disable-kvm --disable-vnc-png --disable-virtfs --disable-fdt --disable-seccomp
+ --disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
  --enable-linux-user --disable-system --static"
 hostmakedepends="pkg-config perl python3 ninja"
 makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
+checksum=f7ac2b85b3f1831e6810b140306e30af91556e15784864b209f3942858947fd0
 
 _fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
  microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: qemu(-user-static): update to 7.1.0.
  2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
  2022-09-29 23:06 ` [PR PATCH] [Updated] " unspecd
@ 2022-09-29 23:09 ` unspecd
  2022-10-14 18:10 ` dataCobra
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: unspecd @ 2022-09-29 23:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/39086#issuecomment-1262922283

Comment:
Rebased.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: qemu(-user-static): update to 7.1.0.
  2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
  2022-09-29 23:06 ` [PR PATCH] [Updated] " unspecd
  2022-09-29 23:09 ` unspecd
@ 2022-10-14 18:10 ` dataCobra
  2022-10-15 20:07 ` [PR PATCH] [Updated] " unspecd
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: dataCobra @ 2022-10-14 18:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 306 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/39086#issuecomment-1279315072

Comment:
Hey @unspecd, could you force push this commit again? So we could check if the failed check might be gone?

In the meantime I'll try this PR on my machine. :+1:

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] qemu(-user-static): update to 7.1.0.
  2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
                   ` (2 preceding siblings ...)
  2022-10-14 18:10 ` dataCobra
@ 2022-10-15 20:07 ` unspecd
  2022-10-15 23:22 ` dataCobra
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: unspecd @ 2022-10-15 20:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/qemu
https://github.com/void-linux/void-packages/pull/39086

qemu(-user-static): update to 7.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ppc64le-musl

### Changes
- `configure_args`:
   - https://github.com/qemu/qemu/commit/95f8510ef428f988897176b9585b8ba1432f939f
- `makedepends`:
   - https://github.com/qemu/qemu/commit/83602083b4ada6ceb86bfb327e83556ebab120fc
- fix-compat-glibc-2.36.patch:
   - https://github.com/qemu/qemu/commit/3cd3df2a9584e6f753bb62a0028bd67124ab5532
-  xxx-ppcle.patch:
   - https://github.com/qemu/qemu/commit/cd362defbbd09cbbc08b3bb465141542887b8cef
   - https://github.com/qemu/qemu/commit/ee3eb3a7ce7242735e6fd64cad53482e3df5a5ec

https://wiki.qemu.org/ChangeLog/7.1


A patch file from https://github.com/void-linux/void-packages/pull/39086.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/qemu-39086.patch --]
[-- Type: text/x-diff, Size: 10738 bytes --]

From a9c3646a60cdd9d197696dbaa510006daa610713 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 3 Sep 2022 19:29:11 +1100
Subject: [PATCH 1/2] qemu: update to 7.1.0.

---
 .../qemu/patches/fix-compat-glibc-2.36.patch  | 100 ------------------
 srcpkgs/qemu/patches/xxx-ppcle.patch          |  34 +++---
 srcpkgs/qemu/template                         |  10 +-
 3 files changed, 25 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch

diff --git a/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch b/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch
deleted file mode 100644
index e7239ad06313..000000000000
--- a/srcpkgs/qemu/patches/fix-compat-glibc-2.36.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3cd3df2a9584e6f753bb62a0028bd67124ab5532 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 2 Aug 2022 12:41:34 -0400
-Subject: [PATCH] linux-user: fix compat with glibc >= 2.36 sys/mount.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The latest glibc 2.36 has extended sys/mount.h so that it
-defines the FSCONFIG_* enum constants. These are historically
-defined in linux/mount.h, and thus if you include both headers
-the compiler complains:
-
-In file included from /usr/include/linux/fs.h:19,
-                 from ../linux-user/syscall.c:98:
-/usr/include/linux/mount.h:95:6: error: redeclaration of 'enum fsconfig_command'
-   95 | enum fsconfig_command {
-      |      ^~~~~~~~~~~~~~~~
-In file included from ../linux-user/syscall.c:31:
-/usr/include/sys/mount.h:189:6: note: originally defined here
-  189 | enum fsconfig_command
-      |      ^~~~~~~~~~~~~~~~
-/usr/include/linux/mount.h:96:9: error: redeclaration of enumerator 'FSCONFIG_SET_FLAG'
-   96 |         FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
-      |         ^~~~~~~~~~~~~~~~~
-/usr/include/sys/mount.h:191:3: note: previous definition of 'FSCONFIG_SET_FLAG' with type 'enum fsconfig_command'
-  191 |   FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
-      |   ^~~~~~~~~~~~~~~~~
-...snip...
-
-QEMU doesn't include linux/mount.h, but it does use
-linux/fs.h and thus gets linux/mount.h indirectly.
-
-glibc acknowledges this problem but does not appear to
-be intending to fix it in the forseeable future, simply
-documenting it as a known incompatibility with no
-workaround:
-
-  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-  https://sourceware.org/glibc/wiki/Synchronizing_Headers
-
-To address this requires either removing use of sys/mount.h
-or linux/fs.h, despite QEMU needing declarations from
-both.
-
-This patch removes linux/fs.h, meaning we have to define
-various FS_IOC constants that are now unavailable.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Tested-by: Richard W.M. Jones <rjones@redhat.com>
-Message-Id: <20220802164134.1851910-1-berrange@redhat.com>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
----
- linux-user/syscall.c | 18 ++++++++++++++++++
- meson.build          |  2 ++
- 2 files changed, 20 insertions(+)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index ef53feb5ab45..f4091212027c 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -95,7 +95,25 @@
- #include <linux/soundcard.h>
- #include <linux/kd.h>
- #include <linux/mtio.h>
-+
-+#ifdef HAVE_SYS_MOUNT_FSCONFIG
-+/*
-+ * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
-+ * which in turn prevents use of linux/fs.h. So we have to
-+ * define the constants ourselves for now.
-+ */
-+#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
-+#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
-+#define FS_IOC_GETVERSION              _IOR('v', 1, long)
-+#define FS_IOC_SETVERSION              _IOW('v', 2, long)
-+#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
-+#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
-+#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
-+#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
-+#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
-+#else
- #include <linux/fs.h>
-+#endif
- #include <linux/fd.h>
- #if defined(CONFIG_FIEMAP)
- #include <linux/fiemap.h>
-diff --git a/meson.build b/meson.build
-index 294e9a8f329e..30a380752c0d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1963,6 +1963,8 @@ config_host_data.set('HAVE_OPTRESET',
-                      cc.has_header_symbol('getopt.h', 'optreset'))
- config_host_data.set('HAVE_IPPROTO_MPTCP',
-                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
-+config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
-+                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
- 
- # has_member
- config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
diff --git a/srcpkgs/qemu/patches/xxx-ppcle.patch b/srcpkgs/qemu/patches/xxx-ppcle.patch
index 7418ca8d2c63..90b32b5e07cd 100644
--- a/srcpkgs/qemu/patches/xxx-ppcle.patch
+++ b/srcpkgs/qemu/patches/xxx-ppcle.patch
@@ -57,7 +57,7 @@ index b9c4b81..cf26497 100644
  #define UNAME_MACHINE "ppc64le"
  #endif
  #else
-+#ifdef TARGET_WORDS_BIGENDIAN
++#if TARGET_BIG_ENDIAN
  #define UNAME_MACHINE "ppc"
 +#else
 +#define UNAME_MACHINE "ppcle"
@@ -89,19 +89,25 @@ index 9f1580a..393943f 100755
          echo "ppcle"
          ;;
      arm|armel|armhf|arm64|armv[4-9]*l|aarch64)
-diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
-index e1b70e2..e07f5fe 100755
---- a/tests/tcg/configure.sh
-+++ b/tests/tcg/configure.sh
-@@ -59,6 +59,8 @@ fi
- : $(cross_cc_mips="mips-linux-gnu-gcc")
- : ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
- : ${cross_cc_cflags_ppc="-m32"}
-+: ${cross_cc_ppcle="powerpcle-linux-gnu-gcc"}
+diff --git a/configure b/configure
+index 72ab03f11a..0691929d76 100755
+--- a/configure
++++ b/configure
+@@ -1866,6 +1866,7 @@ fi
+ : ${cross_prefix_mips="mips-linux-gnu-"}
+ : ${cross_prefix_nios2="nios2-linux-gnu-"}
+ : ${cross_prefix_ppc="powerpc-linux-gnu-"}
++: ${cross_prefix_ppcle="powerpcle-linux-gnu-"}
+ : ${cross_prefix_ppc64="powerpc64-linux-gnu-"}
+ : ${cross_prefix_ppc64le="$cross_prefix_ppc64"}
+ : ${cross_prefix_riscv64="riscv64-linux-gnu-"}
+@@ -1883,6 +1884,7 @@ fi
+ : ${cross_cc_cflags_hexagon="-mv67 -O2 -static"}
+ : ${cross_cc_cflags_i386="-m32"}
+ : ${cross_cc_cflags_ppc="-m32 -mbig-endian"}
 +: ${cross_cc_cflags_ppcle="-m32"}
- : ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"}
- : ${cross_cc_ppc64le="powerpc64le-linux-gnu-gcc"}
- : $(cross_cc_riscv64="riscv64-linux-gnu-gcc")
--- 
+ : ${cross_cc_cflags_ppc64="-m64 -mbig-endian"}
+ : ${cross_cc_ppc64le="$cross_cc_ppc64"}
+ : ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"}
 2.30.1
 
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b851a51b064d..b19ccffa0bab 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,18 +1,18 @@
 # Template file for 'qemu'
 # This package should be updated together with qemu-user-static
 pkgname=qemu
-version=7.0.0
+version=7.1.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
  --disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
- --enable-snappy --enable-tpm --enable-usb-redir --enable-vhost-net --enable-virtfs --enable-vnc-png
+ --enable-snappy --enable-tpm --enable-usb-redir --enable-vhost-net --enable-virtfs --enable-png
  --audio-drv-list=alsa$(vopt_if sdl2 ,sdl)$(vopt_if jack ,jack)$(vopt_if pulseaudio ,pa)
  $(vopt_enable opengl) $(vopt_enable pulseaudio pa) $(vopt_enable sdl2 sdl) $(vopt_enable smartcard)
  $(vopt_enable spice) $(vopt_enable virgl virglrenderer) $(vopt_if gtk3 '--enable-gtk')"
 hostmakedepends="gettext pkg-config perl python3 python3-Sphinx python3-sphinx_rtd_theme ninja"
-makedepends="dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel
- libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
+makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel
+ snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
  libsasl-devel libglib-devel ncurses-devel libseccomp-devel nss-devel
  libcurl-devel xfsprogs-devel libcap-ng-devel vde2-devel usbredir-devel
  libbluetooth-devel libssh2-devel libusb-devel libnfs-devel libslirp-devel
@@ -28,7 +28,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
+checksum=f7ac2b85b3f1831e6810b140306e30af91556e15784864b209f3942858947fd0
 ignore_elf_dirs="/usr/share/qemu"
 nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
  palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf

From 417478a8dc7cc9705890b9c563b866182cd11ffa Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 3 Sep 2022 19:29:34 +1100
Subject: [PATCH 2/2] qemu-user-static: update to 7.1.0.

---
 srcpkgs/qemu-user-static/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 4709d6ac8a3f..c58e58f9cd93 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,12 +1,12 @@
 # Template file for 'qemu-user-static'
 # This package should be updated together with qemu
 pkgname=qemu-user-static
-version=7.0.0
-revision=2
+version=7.1.0
+revision=1
 wrksrc="qemu-${version}"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
- --disable-kvm --disable-vnc-png --disable-virtfs --disable-fdt --disable-seccomp
+ --disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
  --enable-linux-user --disable-system --static"
 hostmakedepends="pkg-config perl python3 ninja"
 makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
+checksum=f7ac2b85b3f1831e6810b140306e30af91556e15784864b209f3942858947fd0
 
 _fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
  microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: qemu(-user-static): update to 7.1.0.
  2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
                   ` (3 preceding siblings ...)
  2022-10-15 20:07 ` [PR PATCH] [Updated] " unspecd
@ 2022-10-15 23:22 ` dataCobra
  2022-10-15 23:27 ` unspecd
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: dataCobra @ 2022-10-15 23:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/39086#issuecomment-1279850012

Comment:
I've tested this PR successfull on x86_64. :+1:

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: qemu(-user-static): update to 7.1.0.
  2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
                   ` (4 preceding siblings ...)
  2022-10-15 23:22 ` dataCobra
@ 2022-10-15 23:27 ` unspecd
  2022-10-18  9:33 ` dataCobra
  2022-10-18 10:34 ` [PR PATCH] [Merged]: " sgn
  7 siblings, 0 replies; 9+ messages in thread
From: unspecd @ 2022-10-15 23:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/39086#issuecomment-1279851071

Comment:
Thanks for testing!

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: qemu(-user-static): update to 7.1.0.
  2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
                   ` (5 preceding siblings ...)
  2022-10-15 23:27 ` unspecd
@ 2022-10-18  9:33 ` dataCobra
  2022-10-18 10:34 ` [PR PATCH] [Merged]: " sgn
  7 siblings, 0 replies; 9+ messages in thread
From: dataCobra @ 2022-10-18  9:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/39086#issuecomment-1279850012

Comment:
I've tested this PR successful on x86_64. :+1:

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: qemu(-user-static): update to 7.1.0.
  2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
                   ` (6 preceding siblings ...)
  2022-10-18  9:33 ` dataCobra
@ 2022-10-18 10:34 ` sgn
  7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-10-18 10:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

There's a merged pull request on the void-packages repository

qemu(-user-static): update to 7.1.0.
https://github.com/void-linux/void-packages/pull/39086

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ppc64le-musl

### Changes
- `configure_args`:
   - https://github.com/qemu/qemu/commit/95f8510ef428f988897176b9585b8ba1432f939f
- `makedepends`:
   - https://github.com/qemu/qemu/commit/83602083b4ada6ceb86bfb327e83556ebab120fc
- fix-compat-glibc-2.36.patch:
   - https://github.com/qemu/qemu/commit/3cd3df2a9584e6f753bb62a0028bd67124ab5532
-  xxx-ppcle.patch:
   - https://github.com/qemu/qemu/commit/cd362defbbd09cbbc08b3bb465141542887b8cef
   - https://github.com/qemu/qemu/commit/ee3eb3a7ce7242735e6fd64cad53482e3df5a5ec

https://wiki.qemu.org/ChangeLog/7.1


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-10-18 10:34 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-03 12:16 [PR PATCH] qemu(-user-static): update to 7.1.0 unspecd
2022-09-29 23:06 ` [PR PATCH] [Updated] " unspecd
2022-09-29 23:09 ` unspecd
2022-10-14 18:10 ` dataCobra
2022-10-15 20:07 ` [PR PATCH] [Updated] " unspecd
2022-10-15 23:22 ` dataCobra
2022-10-15 23:27 ` unspecd
2022-10-18  9:33 ` dataCobra
2022-10-18 10:34 ` [PR PATCH] [Merged]: " sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).