Skip to content
Snippets Groups Projects
Commit 4dbb65be authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

upgrel: 7.2.0-4, fix qemu-user-static-binfmt files

parent 6fab133c
No related branches found
No related tags found
No related merge requests found
Pipeline #2098 failed
......@@ -9,7 +9,7 @@
pkgbase=qemu
pkgver=7.2.0
pkgrel=2
pkgrel=4
pkgdesc="A generic and open source machine emulator and virtualizer"
url='https://www.qemu.org/'
......@@ -328,6 +328,7 @@ package_qemu-common() {
local binfmt_conf_options=(
--exportdir "$pkgdir/usr/lib/binfmt.d/"
--qemu-path "/usr/bin"
--persistent yes
--preserve-argv0
)
......@@ -350,7 +351,10 @@ package_qemu-common() {
done
# modify and rename binfmt.d configs to prevent name conflicts
for _conf in "$pkgdir/usr/lib/binfmt.d/"*; do
cat "$_conf" | tr -d '\n' | sed "s/:$/-static:F/" > "${_conf//.conf/-static.conf}"
_exe_name="$(basename "${_conf/.conf/}")"
_new_exe_name="${_exe_name}-static"
_new_conf_name="${_conf/.conf/-static.conf}"
sed -e "s|usr/bin/${_exe_name}|usr/bin/${_new_exe_name}|" "$_conf" > "${_new_conf_name}"
done
# install default binaries
......@@ -459,7 +463,7 @@ package_qemu-common() {
_pick qemu-system-hppa usr/bin/qemu-system-hppa
_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-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*
......@@ -485,12 +489,10 @@ package_qemu-common() {
_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-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-firmware usr/share/qemu/slof.bin
_pick qemu-system-ppc-firmware usr/share/qemu/u-boot.e500
......@@ -513,7 +515,6 @@ package_qemu-common() {
_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/man/man1/qemu-system-sparc{,64}.1*
# NOTE: needs to be replaced by openbios
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment