Skip to content

Commit e43775b

Browse files
committed
⏰ qemu: auto updated to 10.2.2-4
It has been built because: * nvchecker detects the following updates: alpm(0): 10.2.2-3 -> 10.2.2-4
1 parent be32d18 commit e43775b

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

alarmcn/qemu/PKGBUILD

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pkgname=(
2727
qemu-{base,desktop,emulators-full,full}
2828
)
2929
pkgver=10.2.2
30-
pkgrel=3
30+
pkgrel=4
3131
pkgdesc="A generic and open source machine emulator and virtualizer"
3232
arch=(aarch64 x86_64)
3333
url="https://www.qemu.org/"
@@ -446,10 +446,6 @@ package_qemu-common() {
446446
# remove files provided by seabios
447447
rm -fv "$pkgdir/usr/share/$pkgbase/"{bios,vgabios}*
448448

449-
# remove files provided by edk2-{aarch64,arm,ovmf}
450-
rm -fv "$pkgdir/usr/share/$pkgbase/"edk2-*
451-
rm -frv "$pkgdir/usr/share/$pkgbase/firmware"
452-
453449
(
454450
# create man page symlinks for all system emulators
455451
cd "$pkgdir/usr/share/man/man1"
@@ -525,6 +521,10 @@ package_qemu-common() {
525521
_pick qemu-system-arm usr/share/man/man1/qemu-system-arm.1*
526522

527523
_pick qemu-system-arm-firmware usr/share/qemu/{ast27x0,npcm{7,8}xx}_bootrom.bin
524+
# NOTE: These used to belong to edk2-arm, but upstream edk2 removed support for 32bit ARM.
525+
# We will track them here for as long as QEMU upstream provides them prebuilt.
526+
_pick qemu-system-arm-firmware usr/share/qemu/edk2-arm-{code,vars}.fd
527+
_pick qemu-system-arm-firmware usr/share/qemu/firmware/60-edk2-arm.json
528528

529529
_pick qemu-system-avr usr/bin/qemu-system-avr
530530
_pick qemu-system-avr usr/share/man/man1/qemu-system-avr.1*
@@ -627,6 +627,11 @@ package_qemu-common() {
627627
_pick qemu-vmsr-helper usr/bin/qemu-vmsr-helper
628628
fi
629629
)
630+
631+
# remove files provided by edk2-{aarch64,arm,ovmf}
632+
rm -fv "$pkgdir/usr/share/$pkgbase/"edk2-*
633+
rm -frv "$pkgdir/usr/share/$pkgbase/firmware"
634+
630635
}
631636

632637
package_qemu-audio-alsa() {
@@ -864,13 +869,15 @@ package_qemu-system-alpha-firmware() {
864869

865870
package_qemu-system-arm() {
866871
pkgdesc="QEMU system emulator for ARM"
867-
depends=("${_qemu_system_deps[@]}" dtc edk2-arm qemu-system-arm-firmware=$pkgver-$pkgrel systemd-libs libudev.so)
872+
depends=("${_qemu_system_deps[@]}" dtc qemu-system-arm-firmware=$pkgver-$pkgrel systemd-libs libudev.so)
868873
mv -v $pkgname/* "$pkgdir"
869874
_install_licenses
870875
}
871876

872877
package_qemu-system-arm-firmware() {
873878
pkgdesc="Firmware for QEMU system emulator for ARM"
879+
conflicts=(edk2-arm)
880+
replaces=(edk2-arm)
874881
options=(!strip)
875882
mv -v $pkgname/* "$pkgdir"
876883
_install_licenses
@@ -955,7 +962,7 @@ package_qemu-system-ppc-firmware() {
955962

956963
package_qemu-system-riscv() {
957964
pkgdesc="QEMU system emulator for RISC-V"
958-
depends=("${_qemu_system_deps[@]}" dtc qemu-system-riscv-firmware=$pkgver-$pkgrel systemd-libs libudev.so)
965+
depends=("${_qemu_system_deps[@]}" dtc edk2-riscv64 qemu-system-riscv-firmware=$pkgver-$pkgrel systemd-libs libudev.so)
959966
mv -v $pkgname/* "$pkgdir"
960967
_install_licenses
961968
}

0 commit comments

Comments
 (0)