upgrel: 7.1.0-10

trunk/PKGBUILD

@@ -9,7 +9,7 @@
 
 pkgbase=qemu
 pkgver=7.1.0
-pkgrel=6
+pkgrel=10
 pkgdesc="A generic and open source machine emulator and virtualizer"
 url='https://www.qemu.org/'
 
@@ -24,11 +24,12 @@ pkgname=(
     qemu-hw-s390x-virtio-gpu-ccw
     qemu-hw-usb-{host,redirect,smartcard}
     qemu-img
-    qemu-system-{aarch64,alpha,arm,avr,cris,hppa,loongarch64,m68k,microblaze,mips,nios2,or1k,ppc,riscv,rx,s390x,sh4,sparc,tricore,x86,xtensa}
+    qemu-system-{aarch64,alpha,arm,avr,cris,hppa,loongarch64,m68k,microblaze,mips,nios2,or1k,ppc,riscv,rx,sh4,sparc,tricore,x86,xtensa}
+    qemu-system-{alpha,arm,hppa,microblaze,ppc,riscv,s390x,sparc,x86}-firmware
     qemu-tests
     qemu-tools
     qemu-ui-{curses,dbus,egl-headless,gtk,opengl,sdl,spice-{app,core}}
-    qemu-user{,-static}
+    qemu-user{,-static}{,-binfmt}
     qemu-vhost-user-gpu
     qemu-virtiofsd
     qemu-{base,desktop,emulators-full,full}
@@ -41,12 +42,16 @@ source=(
     qemu-sysusers.conf
     65-kvm.rules
     99-qemu-guest-agent.rules
+    $pkgbase-7.1.0-io_uring.patch::https://patchwork.kernel.org/project/qemu-devel/patch/20220924144815.5591-1-faithilikerun@gmail.com/raw/
 )
 
 #--------------------
 # BUILD PREPARATION ]
 
 prepare() {
+    # fix issues with io_uring: https://gitlab.com/qemu-project/qemu/-/issues/1193
+    patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-7.1.0-io_uring.patch
+
     # extract licenses for TCG
     sed -n '1,23p' $pkgbase-$pkgver/tcg/tcg-internal.h > tcg.LICENSE.MIT
     sed -n '1,23p' $pkgbase-$pkgver/tcg/arm/tcg-target.c.inc > tcg-arm.LICENSE.MIT
@@ -101,6 +106,7 @@ makedepends=(
     ndctl
     numactl
     pam
+    pcre
     python
     python-sphinx
     python-sphinx_rtd_theme
@@ -370,7 +376,7 @@ package_qemu-common() {
   (
     # create man page symlinks for all system emulators
     cd "$pkgdir/usr/share/man/man1"
-    for _name in qemu-system-{aarch64,alpha,arm,avr,cris,hppa,i386,m68k,microblaze{,el},mips{,64,64el,el},nios2,or1k,ppc{,64},riscv{32,64},rx,s390x,sh4{,eb},sparc{,64},tricore,x86_64,xtensa{,eb}}; do
+    for _name in qemu-system-{aarch64,alpha,arm,avr,cris,hppa,i386,loongarch64,m68k,microblaze{,el},mips{,64,64el,el},nios2,or1k,ppc{,64},riscv{32,64},rx,s390x,sh4{,eb},sparc{,64},tricore,x86_64,xtensa{,eb}}; do
       ln -sv $pkgbase.1.gz "$pkgdir/usr/share/man/man1/$_name.1.gz"
     done
   )
@@ -428,13 +434,15 @@ package_qemu-common() {
     _pick qemu-system-aarch64 usr/share/man/man1/qemu-system-aarch64.1*
 
     _pick qemu-system-alpha usr/bin/qemu-system-alpha
-    _pick qemu-system-alpha usr/share/qemu/palcode-clipper
     _pick qemu-system-alpha usr/share/man/man1/qemu-system-alpha.1*
 
+    _pick qemu-system-alpha-firmware usr/share/qemu/palcode-clipper
+
     _pick qemu-system-arm usr/bin/qemu-system-arm
-    _pick qemu-system-arm usr/share/qemu/npcm7xx_bootrom.bin
     _pick qemu-system-arm usr/share/man/man1/qemu-system-arm.1*
 
+    _pick qemu-system-arm-firmware usr/share/qemu/npcm7xx_bootrom.bin
+
     _pick qemu-system-avr usr/bin/qemu-system-avr
     _pick qemu-system-avr usr/share/man/man1/qemu-system-avr.1*
 
@@ -442,17 +450,21 @@ package_qemu-common() {
     _pick qemu-system-cris usr/share/man/man1/qemu-system-cris.1*
 
     _pick qemu-system-hppa usr/bin/qemu-system-hppa
-    _pick qemu-system-hppa usr/share/qemu/hppa-firmware.img
     _pick qemu-system-hppa usr/share/man/man1/qemu-system-hppa.1*
 
+     _pick qemu-system-hppa-firmware usr/share/qemu/hppa-firmware.img
+
     _pick qemu-system-loongarch64 usr/bin/qemu-system-loongarch64
+    _pick qemu-system-loongarch64 usr/share/man/man1/qemu-system-loongarch64.1*
+
     _pick qemu-system-m68k usr/bin/qemu-system-m68k
     _pick qemu-system-m68k usr/share/man/man1/qemu-system-m68k.1*
 
     _pick qemu-system-microblaze usr/bin/qemu-system-microblaze{,el}
-    _pick qemu-system-microblaze usr/share/qemu/petalogix-*.dtb
     _pick qemu-system-microblaze usr/share/man/man1/qemu-system-microblaze{,el}.1*
 
+    _pick qemu-system-microblaze-firmware usr/share/qemu/petalogix-*.dtb
+
     _pick qemu-system-mips usr/bin/qemu-system-mips{,64,64el,el}
     _pick qemu-system-mips usr/share/man/man1/qemu-system-mips{,64,64el,el}.1*
 
@@ -463,48 +475,56 @@ package_qemu-common() {
     _pick qemu-system-or1k usr/share/man/man1/qemu-system-or1k.1*
 
     _pick qemu-system-ppc usr/bin/qemu-system-ppc{,64}
-    _pick qemu-system-ppc usr/share/qemu/{bamboo,canyonlands}.dtb
+    _pick qemu-system-ppc usr/share/man/man1/qemu-system-ppc{,64}.1*
+
+    _pick qemu-system-ppc-firmware usr/share/qemu/{bamboo,canyonlands}.dtb
+
     # NOTE: needs to be replaced by openbios
-    _pick qemu-system-ppc usr/share/qemu/openbios-ppc
-    _pick qemu-system-ppc usr/share/qemu/qemu_vga.ndrv
-    _pick qemu-system-ppc usr/share/qemu/skiboot.lid
+    _pick qemu-system-ppc-firmware usr/share/qemu/openbios-ppc
+    _pick qemu-system-ppc-firmware usr/share/qemu/qemu_vga.ndrv
+    _pick qemu-system-ppc-firmware usr/share/qemu/skiboot.lid
+
     # NOTE: needs to be replaced by slof
-    _pick qemu-system-ppc usr/share/qemu/slof.bin
-    _pick qemu-system-ppc usr/share/qemu/u-boot.e500
-    _pick qemu-system-ppc usr/share/qemu/u-boot-sam460-20100605.bin
-    _pick qemu-system-ppc usr/share/man/man1/qemu-system-ppc{,64}.1*
+    _pick qemu-system-ppc-firmware usr/share/qemu/slof.bin
+    _pick qemu-system-ppc-firmware usr/share/qemu/u-boot.e500
+    _pick qemu-system-ppc-firmware usr/share/qemu/u-boot-sam460-20100605.bin
 
     _pick qemu-system-riscv usr/bin/qemu-system-riscv{32,64}
-    _pick qemu-system-riscv usr/share/qemu/opensbi-riscv{32,64}*.bin
     _pick qemu-system-riscv usr/share/man/man1/qemu-system-riscv{32,64}.1*
 
+    _pick qemu-system-riscv-firmware usr/share/qemu/opensbi-riscv{32,64}*.bin
+
     _pick qemu-system-rx usr/bin/qemu-system-rx
     _pick qemu-system-rx usr/share/man/man1/qemu-system-rx.1*
 
     _pick qemu-system-s390x usr/bin/qemu-system-s390x
-    _pick qemu-system-s390x usr/share/qemu/s390-{ccw,netboot}.img
     _pick qemu-system-s390x usr/share/man/man1/qemu-system-s390x.1*
 
+    _pick qemu-system-s390x-firmware usr/share/qemu/s390-{ccw,netboot}.img
+
     _pick qemu-system-sh4 usr/bin/qemu-system-sh4{,eb}
     _pick qemu-system-sh4 usr/share/man/man1/qemu-system-sh4{,eb}.1*
 
     _pick qemu-system-sparc usr/bin/qemu-system-sparc{,64}
     # NOTE: needs to be replaced by openbios
-    _pick qemu-system-sparc usr/share/qemu/openbios-sparc{32,64}
-    _pick qemu-system-sparc usr/share/qemu/QEMU,{cgthree,tcx}.bin
     _pick qemu-system-sparc usr/share/man/man1/qemu-system-sparc{,64}.1*
 
+    # NOTE: needs to be replaced by openbios
+    _pick qemu-system-sparc-firmware usr/share/qemu/openbios-sparc{32,64}
+    _pick qemu-system-sparc-firmware usr/share/qemu/QEMU,{cgthree,tcx}.bin
+
     _pick qemu-system-tricore usr/bin/qemu-system-tricore
     _pick qemu-system-tricore usr/share/man/man1/qemu-system-tricore.1*
 
     _pick qemu-system-x86 usr/bin/qemu-system-{i386,x86_64}
     _pick qemu-system-x86 usr/lib/qemu/accel-tcg-{i386,x86_64}.so
-    _pick qemu-system-x86 usr/share/qemu/{kvmvapic,linuxboot,multiboot{,_dma},pvh}.bin
-    _pick qemu-system-x86 usr/share/qemu/qboot.rom
-    # NOTE: needs to be replaced by sgabios
-    _pick qemu-system-x86 usr/share/qemu/sgabios.bin
     _pick qemu-system-x86 usr/share/man/man1/qemu-system-{i386,x86_64}.1*
 
+    _pick qemu-system-x86-firmware usr/share/qemu/{kvmvapic,linuxboot,multiboot{,_dma},pvh}.bin
+    _pick qemu-system-x86-firmware usr/share/qemu/qboot.rom
+    # NOTE: needs to be replaced by sgabios
+    _pick qemu-system-x86-firmware usr/share/qemu/sgabios.bin
+
     _pick qemu-system-xtensa usr/bin/qemu-system-xtensa{,eb}
     _pick qemu-system-xtensa usr/share/man/man1/qemu-system-xtensa{,eb}.1*
 
@@ -523,7 +543,7 @@ package_qemu-common() {
     _pick qemu-ui-spice-core usr/lib/qemu/ui-spice-core.so
 
     _pick qemu-user-static usr/bin/qemu-*-static
-    _pick qemu-user-static usr/lib/binfmt.d/*-static.conf
+    _pick qemu-user-binfmt usr/lib/binfmt.d/*.conf
 
     _pick qemu-user usr/bin/qemu-{aarch64{,_be},alpha,arm{,eb},cris,hexagon,hppa,i386,loongarch64,m68k,microblaze{,el},mips{,64,64el,el,n32,n32el},nios2,or1k,ppc{,64,64le},riscv{32,64},s390x,sh4{,eb},sparc{,32plus,64},x86_64,xtensa{,eb}}
     _pick qemu-user usr/lib/binfmt.d/*.conf
@@ -703,13 +723,25 @@ package_qemu-system-aarch64() {
 
 package_qemu-system-alpha() {
   pkgdesc="QEMU system emulator for Alpha"
-  depends=("${_qemu_system_deps[@]}" libudev.so)
+  depends=("${_qemu_system_deps[@]}" qemu-system-alpha-firmware libudev.so)
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-system-alpha-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for Alpha"
+  options=(!strip)
   mv -v $pkgname/* "$pkgdir"
 }
 
 package_qemu-system-arm() {
   pkgdesc="QEMU system emulator for ARM"
-  depends=("${_qemu_system_deps[@]}" libudev.so)
+  depends=("${_qemu_system_deps[@]}" qemu-system-arm-firmware=$pkgver-$pkgrel libudev.so)
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-system-arm-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for ARM"
+  options=(!strip)
   mv -v $pkgname/* "$pkgdir"
 }
 
@@ -727,7 +759,13 @@ package_qemu-system-cris() {
 
 package_qemu-system-hppa() {
   pkgdesc="QEMU system emulator for HPPA"
-  depends=("${_qemu_system_deps[@]}" libudev.so)
+  depends=("${_qemu_system_deps[@]}" qemu-system-hppa-firmware=$pkgver-$pkgrel libudev.so)
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-system-hppa-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for HPPA"
+  options=(!strip)
   mv -v $pkgname/* "$pkgdir"
 }
 
@@ -745,7 +783,13 @@ package_qemu-system-m68k() {
 
 package_qemu-system-microblaze() {
   pkgdesc="QEMU system emulator for Microblaze"
-  depends=("${_qemu_system_deps[@]}")
+  depends=("${_qemu_system_deps[@]}" qemu-system-microblaze-firmware=$pkgver-$pkgrel)
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-system-microblaze-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for Microblaze"
+  options=(!strip)
   mv -v $pkgname/* "$pkgdir"
 }
 
@@ -770,14 +814,26 @@ package_qemu-system-or1k() {
 package_qemu-system-ppc() {
   pkgdesc="QEMU system emulator for PPC"
   # NOTE: will require openbios
-  depends=("${_qemu_system_deps[@]}" libudev.so)
+  depends=("${_qemu_system_deps[@]}" qemu-system-ppc-firmware=$pkgver-$pkgrel libudev.so)
+  options=(!strip)
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-system-ppc-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for PPC"
   options=(!strip)
   mv -v $pkgname/* "$pkgdir"
 }
 
 package_qemu-system-riscv() {
   pkgdesc="QEMU system emulator for RISC-V"
-  depends=("${_qemu_system_deps[@]}" libudev.so)
+  depends=("${_qemu_system_deps[@]}" qemu-system-riscv-firmware=$pkgver-$pkgrel libudev.so)
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-system-riscv-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for RISC-V"
+  options=(!strip)
   mv -v $pkgname/* "$pkgdir"
 }
 
@@ -789,7 +845,13 @@ package_qemu-system-rx() {
 
 package_qemu-system-s390x() {
   pkgdesc="QEMU system emulator for S390"
-  depends=("${_qemu_system_deps[@]}")
+  depends=("${_qemu_system_deps[@]}" qemu-system-s390x-firmware=$pkgver-$pkgrel)
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-system-s390x-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for S390"
+  options=(!strip)
   mv -v $pkgname/* "$pkgdir"
 }
 
@@ -802,7 +864,14 @@ package_qemu-system-sh4() {
 package_qemu-system-sparc() {
   pkgdesc="QEMU system emulator for SPARC"
   # NOTE: will require openbios
-  depends=("${_qemu_system_deps[@]}" libudev.so)
+  depends=("${_qemu_system_deps[@]}" qemu-system-sparc-firmware=$pkgver-$pkgrel libudev.so)
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-system-sparc-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for SPARC"
+  options=(!strip)
+  # NOTE: will require openbios
   mv -v $pkgname/* "$pkgdir"
 }
 
@@ -814,10 +883,16 @@ package_qemu-system-tricore() {
 
 package_qemu-system-x86() {
   pkgdesc="QEMU system emulator for x86"
-  depends=("${_qemu_system_deps[@]}" edk2-ovmf seabios libudev.so)
+  depends=("${_qemu_system_deps[@]}" qemu-system-x86-firmware=$pkgver-$pkgrel edk2-ovmf seabios libudev.so)
   mv -v $pkgname/* "$pkgdir"
 }
 
+package_qemu-system-x86-firmware() {
+  pkgdesc="Firmware for QEMU system emulator for x86"
+  options=(!strip)
+  mv -v $pkgname/* "$pkgdir"
+
+
 package_qemu-system-xtensa() {
   pkgdesc="QEMU system emulator for Xtensa"
   depends=("${_qemu_system_deps[@]}" libudev.so)
@@ -935,12 +1010,22 @@ package_qemu-ui-spice-core() {
 package_qemu-user() {
   pkgdesc="QEMU user mode emulation"
   depends=(capstone gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc gnutls liburing liburing.so qemu-common=$pkgver-$pkgrel zlib)
+  optdepends=('qemu-user-binfmt: for binary format rules')
+  mv -v $pkgname/* "$pkgdir"
+}
+
+package_qemu-user-binfmt() {
+  pkgdesc="Binary format rules for QEMU user mode emulation"
+  depends=(qemu-user=$pkgver-$pkgrel)
+  provides=(qemu-user-binfmt-provider)
+  conflicts=(qemu-user-binfmt-provider)
   mv -v $pkgname/* "$pkgdir"
 }
 
 package_qemu-user-static() {
   pkgdesc="QEMU static user mode emulation"
   depends=(glibc)
+  optdepends=('qemu-user-static-binfmt: for binary format rules')
   mv -v $pkgname/* "$pkgdir"
 }
 
@@ -950,6 +1035,14 @@ package_qemu-vhost-user-gpu() {
   mv -v $pkgname/* "$pkgdir"
 }
 
+package_qemu-user-static-binfmt() {
+  pkgdesc="Binary format rules for QEMU static user mode emulation"
+  depends=(qemu-user-static=$pkgver-$pkgrel)
+  provides=(qemu-user-binfmt-provider)
+  conflicts=(qemu-user-binfmt-provider)
+  mv -v $pkgname/* "$pkgdir"
+}
+
 package_qemu-virtiofsd() {
   pkgdesc="QEMU virtio-fs shared filesystem daemon"
   depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc libcap-ng libcap-ng.so libseccomp libseccomp.so qemu-common=$pkgver-$pkgrel)