From f2f195be03fa5e7a8d954f0f27abc1a660b8db80 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Wed, 13 Nov 2024 13:08:12 +0800 Subject: [PATCH] updpatch: qemu 9.1.1-2 --- qemu/riscv64.patch | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/qemu/riscv64.patch b/qemu/riscv64.patch index afa4fa99c..548dd4bbd 100644 --- a/qemu/riscv64.patch +++ b/qemu/riscv64.patch @@ -1,3 +1,5 @@ +diff --git PKGBUILD PKGBUILD +index d6b9c07..d2958dc 100644 --- PKGBUILD +++ PKGBUILD @@ -22,7 +22,6 @@ pkgname=( @@ -7,7 +9,7 @@ - qemu-vmsr-helper qemu-{base,desktop,emulators-full,full} ) - pkgver=9.1.0 + pkgver=9.1.1 @@ -123,6 +122,7 @@ makedepends=( zlib zstd @@ -16,7 +18,7 @@ source=( https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig} bridge.conf -@@ -429,13 +429,6 @@ package_qemu-common() { +@@ -431,13 +431,6 @@ package_qemu-common() { # remove unneeded files find "$pkgdir" -name .buildinfo -delete @@ -30,7 +32,7 @@ ( # create man page symlinks for all system emulators cd "$pkgdir/usr/share/man/man1" -@@ -496,6 +489,9 @@ package_qemu-common() { +@@ -498,6 +491,9 @@ package_qemu-common() { _pick qemu-system-aarch64 usr/bin/qemu-system-aarch64 _pick qemu-system-aarch64 usr/share/man/man1/qemu-system-aarch64.1* @@ -40,7 +42,7 @@ _pick qemu-system-alpha usr/bin/qemu-system-alpha _pick qemu-system-alpha usr/share/man/man1/qemu-system-alpha.1* -@@ -506,6 +502,9 @@ package_qemu-common() { +@@ -508,6 +504,9 @@ package_qemu-common() { _pick qemu-system-arm usr/share/man/man1/qemu-system-arm.1* _pick qemu-system-arm-firmware usr/share/qemu/npcm7xx_bootrom.bin @@ -50,7 +52,7 @@ _pick qemu-system-avr usr/bin/qemu-system-avr _pick qemu-system-avr usr/share/man/man1/qemu-system-avr.1* -@@ -580,6 +579,13 @@ package_qemu-common() { +@@ -582,6 +581,13 @@ package_qemu-common() { _pick qemu-system-x86-firmware usr/share/qemu/{kvmvapic,linuxboot,multiboot{,_dma},pvh}.bin _pick qemu-system-x86-firmware usr/share/qemu/qboot.rom @@ -64,7 +66,7 @@ _pick qemu-system-xtensa usr/bin/qemu-system-xtensa{,eb} _pick qemu-system-xtensa usr/share/man/man1/qemu-system-xtensa{,eb}.1* -@@ -607,7 +613,6 @@ package_qemu-common() { +@@ -609,7 +615,6 @@ package_qemu-common() { _pick qemu-vhost-user-gpu usr/lib/qemu/vhost-user-gpu _pick qemu-vhost-user-gpu usr/share/qemu/vhost-user/50-qemu-gpu.json @@ -72,34 +74,34 @@ ) } -@@ -804,7 +809,7 @@ package_qemu-hw-s390x-virtio-gpu-ccw() { +@@ -806,7 +811,7 @@ package_qemu-hw-s390x-virtio-gpu-ccw() { package_qemu-system-aarch64() { pkgdesc="QEMU system emulator for AARCH64" -- depends=("${_qemu_system_deps[@]}" edk2-aarch64 systemd-libs libudev.so) -+ depends=("${_qemu_system_deps[@]}" systemd-libs libudev.so) +- depends=("${_qemu_system_deps[@]}" dtc edk2-aarch64 systemd-libs libudev.so) ++ depends=("${_qemu_system_deps[@]}" dtc systemd-libs libudev.so) mv -v $pkgname/* "$pkgdir" _install_licenses } -@@ -825,7 +830,7 @@ package_qemu-system-alpha-firmware() { +@@ -827,7 +832,7 @@ package_qemu-system-alpha-firmware() { package_qemu-system-arm() { pkgdesc="QEMU system emulator for ARM" -- depends=("${_qemu_system_deps[@]}" edk2-arm qemu-system-arm-firmware=$pkgver-$pkgrel systemd-libs libudev.so) -+ depends=("${_qemu_system_deps[@]}" qemu-system-arm-firmware=$pkgver-$pkgrel systemd-libs libudev.so) +- depends=("${_qemu_system_deps[@]}" dtc edk2-arm qemu-system-arm-firmware=$pkgver-$pkgrel systemd-libs libudev.so) ++ depends=("${_qemu_system_deps[@]}" dtc qemu-system-arm-firmware=$pkgver-$pkgrel systemd-libs libudev.so) mv -v $pkgname/* "$pkgdir" _install_licenses } -@@ -987,7 +992,7 @@ package_qemu-system-tricore() { +@@ -989,7 +994,7 @@ package_qemu-system-tricore() { package_qemu-system-x86() { pkgdesc="QEMU system emulator for x86" -- depends=("${_qemu_system_deps[@]}" edk2-ovmf qemu-system-x86-firmware=$pkgver-$pkgrel seabios systemd-libs libudev.so) -+ depends=("${_qemu_system_deps[@]}" qemu-system-x86-firmware=$pkgver-$pkgrel systemd-libs libudev.so) +- depends=("${_qemu_system_deps[@]}" dtc edk2-ovmf qemu-system-x86-firmware=$pkgver-$pkgrel seabios systemd-libs libudev.so) ++ depends=("${_qemu_system_deps[@]}" dtc qemu-system-x86-firmware=$pkgver-$pkgrel systemd-libs libudev.so) mv -v $pkgname/* "$pkgdir" _install_licenses } -@@ -1231,7 +1236,6 @@ package_qemu-full() { +@@ -1233,7 +1238,6 @@ package_qemu-full() { qemu-tests=$pkgver-$pkgrel qemu-tools=$pkgver-$pkgrel qemu-user=$pkgver-$pkgrel