diff --git a/srcpkgs/edk2-ovmf/template b/srcpkgs/edk2-ovmf/template index a44b6b4000b1ed..3b7af7ddbe2f23 100644 --- a/srcpkgs/edk2-ovmf/template +++ b/srcpkgs/edk2-ovmf/template @@ -1,11 +1,11 @@ # Template file for 'edk2-ovmf' pkgname=edk2-ovmf -version=202511 +version=202605 revision=1 _mipi_ver=370b5944c046bab043dd8b133727b2135af7747a _openssl_ver=3.5.1 -_mbedtls_ver=8c89224991adff88d53cd380f42a2baa36f91454 -_spdm_ver=98ef964e1e9a0c39c7efb67143d3a13a819432e0 +_mbedtls_ver=0bebf8b8c7f07abe3571ded48a11aa907a1ffb20 +_spdm_ver=1be116c7b7713fa9003e1bd53b53a34758549eb9 _fdt_ver=cfff805481bdea27f900c32698171286542b8d3c archs="x86_64* i686* aarch64*" hostmakedepends="acpica-utils nasm python3 libuuid-devel" @@ -20,11 +20,11 @@ distfiles="https://github.com/tianocore/edk2/archive/refs/tags/edk2-stable${vers https://github.com/Mbed-TLS/mbedtls/archive/${_mbedtls_ver}.tar.gz>mbedtls-${_mbedtls_ver}.tar.gz https://github.com/DMTF/libspdm/archive/${_spdm_ver}.tar.gz>libspdm-${_spdm_ver}.tar.gz https://github.com/devicetree-org/pylibfdt/archive/${_fdt_ver}.tar.gz>libfdt-${_fdt_ver}.tar.gz" -checksum="d919b0344afbd9ea16d757f99919860e26acc1e9246fff743e684128c2f04dd3 +checksum="871ffdc477ccb64fc82ea6169d8de262a661888bf21b41f70fab62e825648bce 9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b 529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f - b5c7e7c54e013c168f4aae036e59912785f11b4aeebd57f6165a14e879b9a82c - 634cbdf10bcaf32f3446b1bf8be7e8a60cecd1e9500e512f01e3c15b74cbcfd3 + 61ac65f6362f898677b2a4cf2a769b41e4aee0985cb45f046d3b719388e5be59 + 59275edc6fb56c629305e6f01fe173ddf9f065cde995f18b89a64e128eae8604 1193910f475fde07f3cd4fe1c1a353d69b8cedb574967134838fcdc8208d224e" skip_extraction="mipi-${_mipi_ver}.tar.gz @@ -58,14 +58,14 @@ post_extract() { do_build() { local PATH="BaseTools/BinWrappers/PosixLike:$PATH" - local _common_args=(-b RELEASE -n "$XBPS_MAKEJOBS" -t GCC5) + local _common_args=(-b RELEASE -n "$XBPS_MAKEJOBS" -t GCC) local _efi_args=(-D NETWORK_IP6_ENABLE -D TPM_CONFIG_ENABLE -D TPM1_ENABLE -D TPM2_ENABLE) local _x86_args=(-D FD_SIZE_2MB -D HTTP_BOOT_ENABLE -D TLS_ENABLE) local _4mb_args=(-D FD_SIZE_4MB -D FD_SIZE_IN_KB=4096 -D HTTP_BOOT_ENABLE -D TLS_ENABLE) case "$XBPS_MACHINE" in x86_64*|i686*) - export GCC5_AARCH64_PREFIX="aarch64-linux-${_pfx}-" + export GCC_AARCH64_PREFIX="aarch64-linux-${_pfx}-" ;; esac @@ -116,10 +116,10 @@ do_build() { "${_common_args[@]}" "${_efi_args[@]}" \ -D NETWORK_HTTP_BOOT_ENABLE -D TLS_ENABLE -D SECURE_BOOT_ENABLE - dd if=/dev/zero of="Build/ArmVirtQemu-AArch64/RELEASE_GCC5/FV/QEMU_CODE.fd" bs=1M count=64 - dd if="Build/ArmVirtQemu-AArch64/RELEASE_GCC5/FV/QEMU_EFI.fd" \ - of="Build/ArmVirtQemu-AArch64/RELEASE_GCC5/FV/QEMU_CODE.fd" conv=notrunc - dd if=/dev/zero of="Build/ArmVirtQemu-AArch64/RELEASE_GCC5/FV/QEMU_VARS.fd" bs=1M count=64 + dd if=/dev/zero of="Build/ArmVirtQemu-AArch64/RELEASE_GCC/FV/QEMU_CODE.fd" bs=1M count=64 + dd if="Build/ArmVirtQemu-AArch64/RELEASE_GCC/FV/QEMU_EFI.fd" \ + of="Build/ArmVirtQemu-AArch64/RELEASE_GCC/FV/QEMU_CODE.fd" conv=notrunc + dd if=/dev/zero of="Build/ArmVirtQemu-AArch64/RELEASE_GCC/FV/QEMU_VARS.fd" bs=1M count=64 ;; esac done @@ -132,32 +132,32 @@ do_install() { for _arch in "${_archs[@]}"; do vmkdir "usr/share/edk2/${_arch,,}" - vinstall "Build/Shell/RELEASE_GCC5/${_arch}/Shell_7C04A583-9E3E-4f1c-AD65-E05268D0B4D1.efi" 644 \ + vinstall "Build/Shell/RELEASE_GCC/${_arch}/Shell_7C04A583-9E3E-4f1c-AD65-E05268D0B4D1.efi" 644 \ "usr/share/edk2/${_arch,,}" Shell.efi - vinstall "Build/Shell/RELEASE_GCC5/${_arch}/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi" 644 \ + vinstall "Build/Shell/RELEASE_GCC/${_arch}/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi" 644 \ "usr/share/edk2/${_arch,,}" Shell_Full.efi case "$_arch" in X64) - vinstall "Build/Ovmf${_arch}/RELEASE_GCC5/FV/OVMF.fd" 644 "usr/share/edk2/${_arch,,}" - vinstall "Build/Ovmf${_arch}/RELEASE_GCC5/FV/OVMF_CODE.fd" 644 "usr/share/edk2/${_arch,,}" - vinstall "Build/Ovmf${_arch}/RELEASE_GCC5/FV/OVMF_VARS.fd" 644 "usr/share/edk2/${_arch,,}" + vinstall "Build/Ovmf${_arch}/RELEASE_GCC/FV/OVMF.fd" 644 "usr/share/edk2/${_arch,,}" + vinstall "Build/Ovmf${_arch}/RELEASE_GCC/FV/OVMF_CODE.fd" 644 "usr/share/edk2/${_arch,,}" + vinstall "Build/Ovmf${_arch}/RELEASE_GCC/FV/OVMF_VARS.fd" 644 "usr/share/edk2/${_arch,,}" - vinstall "Build/Ovmf${_arch}-4mb/RELEASE_GCC5/FV/OVMF.fd" 644 "usr/share/edk2/${_arch,,}" OVMF.4m.fd - vinstall "Build/Ovmf${_arch}-4mb/RELEASE_GCC5/FV/OVMF_CODE.fd" 644 "usr/share/edk2/${_arch,,}" OVMF_CODE.4m.fd - vinstall "Build/Ovmf${_arch}-4mb/RELEASE_GCC5/FV/OVMF_VARS.fd" 644 "usr/share/edk2/${_arch,,}" OVMF_VARS.4m.fd + vinstall "Build/Ovmf${_arch}-4mb/RELEASE_GCC/FV/OVMF.fd" 644 "usr/share/edk2/${_arch,,}" OVMF.4m.fd + vinstall "Build/Ovmf${_arch}-4mb/RELEASE_GCC/FV/OVMF_CODE.fd" 644 "usr/share/edk2/${_arch,,}" OVMF_CODE.4m.fd + vinstall "Build/Ovmf${_arch}-4mb/RELEASE_GCC/FV/OVMF_VARS.fd" 644 "usr/share/edk2/${_arch,,}" OVMF_VARS.4m.fd - vinstall "Build/Ovmf3264-secure/RELEASE_GCC5/FV/OVMF_CODE.fd" 644 "usr/share/edk2/${_arch,,}" OVMF_CODE.secure.fd - vinstall "Build/Ovmf3264-secure-4mb/RELEASE_GCC5/FV/OVMF_CODE.fd" 644 "usr/share/edk2/${_arch,,}" OVMF_CODE.secure.4m.fd + vinstall "Build/Ovmf3264-secure/RELEASE_GCC/FV/OVMF_CODE.fd" 644 "usr/share/edk2/${_arch,,}" OVMF_CODE.secure.fd + vinstall "Build/Ovmf3264-secure-4mb/RELEASE_GCC/FV/OVMF_CODE.fd" 644 "usr/share/edk2/${_arch,,}" OVMF_CODE.secure.4m.fd - vinstall "Build/MicrovmX64/RELEASE_GCC5/FV/MICROVM.fd" 644 "usr/share/edk2/${_arch,,}" MICROVM.fd - vinstall "Build/MicrovmX64-4mb/RELEASE_GCC5/FV/MICROVM.fd" 644 "usr/share/edk2/${_arch,,}" MICROVM.4m.fd + vinstall "Build/MicrovmX64/RELEASE_GCC/FV/MICROVM.fd" 644 "usr/share/edk2/${_arch,,}" MICROVM.fd + vinstall "Build/MicrovmX64-4mb/RELEASE_GCC/FV/MICROVM.fd" 644 "usr/share/edk2/${_arch,,}" MICROVM.4m.fd vcopy "${FILESDIR}/*x86_64*.json" usr/share/qemu/firmware vcopy "${FILESDIR}/*microvm*.json" usr/share/qemu/firmware ;; AARCH64) - vcopy "Build/ArmVirtQemu-AArch64/RELEASE_GCC5/FV/*.fd" "usr/share/edk2/${_arch,,}" + vcopy "Build/ArmVirtQemu-AArch64/RELEASE_GCC/FV/*.fd" "usr/share/edk2/${_arch,,}" # libvirt hardcodes this ln -s ../edk2/aarch64/QEMU_CODE.fd "${DESTDIR}/usr/share/AAVMF/AAVMF_CODE.fd" diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 27c506c98ac44a..17110dc40ab3c1 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,6 +1,6 @@ # Template file for 'libvirt' pkgname=libvirt -version=12.2.0 +version=12.4.0 revision=1 build_style=meson configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run @@ -20,7 +20,7 @@ license="LGPL-2.1-or-later" homepage="https://libvirt.org" changelog="https://raw.githubusercontent.com/libvirt/libvirt/master/NEWS.rst" distfiles="https://libvirt.org/sources/libvirt-${version}.tar.xz" -checksum=ac93cd0da743a6c231911fb549399b415102ecfee775329bebbf61ed843b9786 +checksum=c86c7f758391b895ec90f76f965a56266167028978ac6dce824fea4d6a036b6d # At least one test times out on CI but works locally make_check=ci-skip diff --git a/srcpkgs/python3-qemu.qmp/template b/srcpkgs/python3-qemu.qmp/template new file mode 100644 index 00000000000000..cdaf666aea036e --- /dev/null +++ b/srcpkgs/python3-qemu.qmp/template @@ -0,0 +1,13 @@ +# Template file for 'python3-qemu.qmp' +pkgname=python3-qemu.qmp +version=0.0.6 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel" +short_desc="QEMU Monitor Protocol Library" +maintainer="classabbyamp " +license="LGPL-2.0-or-later" +homepage="https://gitlab.com/qemu-project/python-qemu-qmp" +changelog="https://qemu.readthedocs.io/projects/python-qemu-qmp/en/latest/main.html#changelog" +distfiles="${PYPI_SITE}/q/qemu_qmp/qemu_qmp-${version}.tar.gz" +checksum=a3c25d871fab549122b2340810de1f99481002c942a2132476b062aacdbf6e92 diff --git a/srcpkgs/qemu-system-microblazeel b/srcpkgs/qemu-system-microblazeel deleted file mode 120000 index d3d421aa08c50d..00000000000000 --- a/srcpkgs/qemu-system-microblazeel +++ /dev/null @@ -1 +0,0 @@ -qemu \ No newline at end of file diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template index 2b5b99e52f1006..83e2b7ff224855 100644 --- a/srcpkgs/qemu-user/template +++ b/srcpkgs/qemu-user/template @@ -1,22 +1,24 @@ # Template file for 'qemu-user' # This package should be updated together with qemu pkgname=qemu-user -version=10.2.0 +version=11.0.1 revision=1 +archs="~i686* ~arm*" build_style=configure metapackage=yes configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec - --enable-linux-user --disable-system --static + --enable-linux-user --disable-system --static --disable-download -Dkvm=disabled -Dpng=disabled -Dvirtfs=disabled -Dfdt=disabled -Dseccomp=disabled -Dtools=disabled" -hostmakedepends="meson flex glib-devel pkg-config perl python3-pycotap" +hostmakedepends="meson flex glib-devel pkg-config perl python3-pycotap + python3-wheel python3-qemu.qmp" makedepends="dtc-devel glib-devel pixman-devel libuuid-devel" short_desc="QEMU user-mode emulators" maintainer="classabbyamp " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://www.qemu.org" distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2" -checksum=d83265d94d80e4a3da87366a8ff6e7bbd29948417adb73fef3f420eeef68a90c +checksum=e1b079492ef4f4d1b25a7b3c37a40a9d0a220e1d6c62173a5129f889697c8726 subpackages="qemu-user-static" if [ "$CROSS_BUILD" ]; then @@ -41,9 +43,6 @@ _archs=( sparc xtensa xtensaeb -) - -_archs64=( aarch64 aarch64_be alpha @@ -62,10 +61,6 @@ _archs64=( x86_64 ) -if [ "$XBPS_TARGET_WORDSIZE" -eq 64 ]; then - _archs+=("${_archs64[@]}") -fi - for _arch in "${_archs[@]}"; do # bug in xbps: it hates package names ending in _N _pkgname="qemu-user-${_arch//x86_64/amd64}" @@ -116,11 +111,6 @@ post_install() { HOST_ARCH="${XBPS_TARGET_MACHINE%-musl}" scripts/qemu-binfmt-conf.sh --debian \ --exportdir "${DESTDIR}"/usr/share/binfmts --qemu-path /usr/bin \ --preserve-argv0 yes --persistent yes --credential yes - if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then - for a in "${_archs64[@]}"; do - rm -f "${DESTDIR}/usr/share/binfmts/qemu-${a}" - done - fi } qemu-user-static_package() { diff --git a/srcpkgs/qemu/patches/mmap-mremap-efault.patch b/srcpkgs/qemu/patches/mmap-mremap-efault.patch deleted file mode 100644 index 388d11d10d2390..00000000000000 --- a/srcpkgs/qemu/patches/mmap-mremap-efault.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f2adfc703e94819b0daca98fde1d0a30168c292d Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Fri, 8 Jan 2021 17:27:06 +0000 -Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit - -When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an -infinite loop of mremap calls of ever decreasing/increasing addresses. - -I suspect something in the musl memory allocation code loops indefinitely -if it only sees ENOMEM and only exits when it hits EFAULT. - -According to the docs, trying to mremap outside the address space -can/should return EFAULT and changing this allows the build to succeed. - -A better return value for the other cases of invalid addresses is EINVAL -rather than ENOMEM so adjust the other part of the test to this. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] -Signed-off-by: Richard Purdie