Date: Thursday, December 15, 2022 @ 16:15:59
Author: dvzrv
Revision: 464439
upgpkg: qemu 7.2.0-1: Upgrade to 7.2.0.
Add missing dependencies on numactl where needed.
Adapt configure option for changes to libslirp integration.
Remove now included patches.
Modified:
qemu/trunk/PKGBUILD
----------+
PKGBUILD | 45 +++++++++++++++------------------------------
1 file changed, 15 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-15 15:15:05 UTC (rev 464438)
+++ PKGBUILD 2022-12-15 16:15:59 UTC (rev 464439)
@@ -25,8 +25,8 @@
qemu-virtiofsd
qemu-{base,desktop,emulators-full,full}
)
-pkgver=7.1.0
-pkgrel=11
+pkgver=7.2.0
+pkgrel=1
pkgdesc="A generic and open source machine emulator and virtualizer"
arch=(x86_64)
url="https://www.qemu.org/";
@@ -105,30 +105,21 @@
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/[email protected]/raw/
-
$pkgbase-7.1.0-block1.patch::https://gitlab.com/qemu-project/qemu/-/commit/a7c5f67a78569f8c275ea4ea9962e9c79b9d03cb.diff
-
$pkgbase-7.1.0-block2.patch::https://gitlab.com/qemu-project/qemu/-/commit/25474d90aa50bd32e0de395a33d8de42dd6f2aef.diff
)
-sha512sums=('c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f'
+sha512sums=('f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13'
'SKIP'
'7b412ffa5dcda47b0a4ec9e2c5e5e1d9eaaaf0a087b7ea3ead3e706ba4c9cafb919beadd088a0299b6f7aab753b81a5eafb545b4842ee5f26646d16544dd02a7'
'6e838773d63ae0ffdffe2b891bf611d8f5f3c67a9bc4cbbedf8363c150c2c9971c8e44d92270bc581af40eb0ece02192760bcdd6aee229fff55635f3a4825afa'
'985c2c7a6b5217c87a15b45368089ee91b2f9027b070f9eafa448a18b27ae0d9edd964d52e134b9c1f4aeef4d6aae88afd3f454551ca898affef7f9d28b99b8f'
'bdf05f99407491e27a03aaf845b7cc8acfa2e0e59968236f10ffc905e5e3d5e8569df496fd71c887da2b5b8d1902494520c7da2d3a8258f7fd93a881dd610c99'
-
'93b905046fcea8a0a89513b9259c222494ab3b91319dde23baebcb40dc17376a56661b159b99785d6e816831974a0f3cbd7b2f7d89e5fc3c258f88f4492f3839'
-
'306193b1ed6396acaf5d3d3957dd09954fadc7546c757cca113b35e6a0ad06e41efb94adcd9810d814858a7e2d5d3e535398128820e770b0bbdef2e5ab125cb0'
-
'2d1c76e2c1433867a0156bfb067a0df2229083b61215a87a317685c47f7921b0ce815901dccb005508cf0793b8c9dc37f76ef27b302fe78eb740df073710e672'
-
'4ad2aff54b9e7a85fc62c7dceceda5f946e7578dd1b9902a74383ffadce91d8ae7a4219e9ae3184fcba51fccea2f69fc040277c30b7566e79eb29e1604acd594')
-b2sums=('e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf'
+
'93b905046fcea8a0a89513b9259c222494ab3b91319dde23baebcb40dc17376a56661b159b99785d6e816831974a0f3cbd7b2f7d89e5fc3c258f88f4492f3839')
+b2sums=('415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530'
'SKIP'
'b1eca364aa60f130ff5e649f5d004d3fcb75356d3421a4542efdfc410d39b40d9434d15e1dd7bbdbd315cb72b5290d3ea5f77f9c41961a5601cd28ef7bbe72e8'
'2102e4a34e11e406e9606c97e026e7b92e887e296a7f77b9cede1b37119d0df33735f3588628167b2b8e32244c196c491bfab623e2caddac9014d445aa2a6d98'
'69177b962d2fda20cafdbc6226fd017b5ca5a0f69f866d055dc1c744b7b2955059f47c693cfb5b4c863ec159569fdabd4327ab4b8a95566a68cd8ce38e339c7a'
'3559fe9c4f744194939770047a0a02d07ff791c845a80726d0bc7b8c4801ed5f11150e7d5adab813844b3dab1cf38c3a5a87fb6efbb8fc9dccdda9fa56409ed8'
-
'a9a2bdfeeb44eb86cbe88ac7c65f72800bdb2fd5cecb02f3a258cf9470b52832180aab43c89d481f7fd4d067342a9a27dd6c8a94d625b95d6e2b912e47d274e7'
-
'd8b392ef1cd629796a9221f13df43a3ea3a4c2d50a574888a65fa5f9ecffcc75134b0a33ec798be65706831043926ceb2d4b1a8751fedcd181271a986318e6ed'
-
'06d1b099ef1acf393f2866925bbb43a6ad93c28b976deb69c4859aca8f3bd4180e3d49ff43a3d75193af4dd890ee38243a661399517dd4bb3fb74493f7ecfe7f'
-
'5171ae60bbaeb7f277459c27d18ece0d7ea890a71c2cdd110ea84e15b77e3dd491b75965583a1daa859459afafa5310544f58846b38997f91e307ce86a70ab45')
+
'a9a2bdfeeb44eb86cbe88ac7c65f72800bdb2fd5cecb02f3a258cf9470b52832180aab43c89d481f7fd4d067342a9a27dd6c8a94d625b95d6e2b912e47d274e7')
validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') # Michael Roth
<[email protected]>
_qemu_system_deps=(
@@ -236,13 +227,7 @@
}
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
- # fix issue with block alignment: https://bugs.archlinux.org/task/76220
- patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-7.1.0-block1.patch
- patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-7.1.0-block2.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
@@ -315,7 +300,7 @@
--docdir=/usr/share/doc/qemu \
--enable-modules \
--enable-sdl \
- --enable-slirp=system \
+ --enable-slirp \
--enable-tpm \
--smbd=/usr/bin/smbd \
--with-coroutine=ucontext
@@ -333,7 +318,7 @@
)
license+=(BSD MIT)
- depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so hicolor-icon-theme
libcap-ng libcap-ng.so)
+ depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so hicolor-icon-theme
libcap-ng libcap-ng.so numactl libnuma.so)
backup=(
etc/$pkgbase/bridge.conf
etc/sasl2/$pkgbase.conf
@@ -659,7 +644,7 @@
package_qemu-guest-agent() {
pkgdesc="QEMU Guest Agent"
- depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc liburing
liburing.so systemd-libs libudev.so)
+ depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc liburing
liburing.so numactl libnuma.so systemd-libs libudev.so)
backup=(
etc/$pkgbase/$pkgbase-ga.conf
etc/$pkgbase/fsfreeze-hook
@@ -922,13 +907,13 @@
package_qemu-img() {
pkgdesc="QEMU tooling for manipulating disk images"
- depends=(fuse3 gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc gnutls
libaio liburing liburing.so pam libpam.so zlib zstd libzstd.so)
+ depends=(fuse3 gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc gnutls
libaio liburing liburing.so numactl libnuma.so pam libpam.so zlib zstd
libzstd.so)
mv -v $pkgname/* "$pkgdir"
}
package_qemu-pr-helper() {
pkgdesc="QEMU persistent reservation utility"
- depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc gnutls
libcap-ng libcap-ng.so liburing liburing.so multipath-tools pam libpam.so
qemu-common=$pkgver-$pkgrel)
+ depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc gnutls
libcap-ng libcap-ng.so liburing liburing.so multipath-tools numactl libnuma.so
pam libpam.so qemu-common=$pkgver-$pkgrel)
mv -v $pkgname/* "$pkgdir"
install -vDm 644 $pkgbase-$pkgver/contrib/systemd/$pkgname.{service,socket}
-t "$pkgdir/usr/lib/systemd/system/"
}
@@ -941,7 +926,7 @@
package_qemu-tools() {
pkgdesc="QEMU tools"
- depends=(curl libcurl.so gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so
glibc libxkbcommon libxkbcommon.so python qemu-common=$pkgver-$pkgrel)
+ depends=(curl libcurl.so gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so
glibc libxkbcommon libxkbcommon.so numactl libnuma.so python
qemu-common=$pkgver-$pkgrel)
mv -v $pkgname/* "$pkgdir"
install -vDm 644 $pkgbase-$pkgver/scripts/dump-guest-memory.py -t
"$pkgdir/usr/share/$pkgbase/"
install -vDm 755 $pkgbase-$pkgver/scripts/simpletrace.py -t
"$pkgdir/usr/share/$pkgbase/"
@@ -1013,7 +998,7 @@
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)
+ depends=(capstone gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc
gnutls liburing liburing.so numactl libnuma.so qemu-common=$pkgver-$pkgrel zlib)
optdepends=('qemu-user-binfmt: for binary format rules')
mv -v $pkgname/* "$pkgdir"
}
@@ -1043,13 +1028,13 @@
package_qemu-vhost-user-gpu() {
pkgdesc="QEMU vhost-user-gpu display device"
- depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc pixman
libpixman-1.so mesa qemu-common=$pkgver-$pkgrel virglrenderer)
+ depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc pixman
libpixman-1.so mesa numactl libnuma.so qemu-common=$pkgver-$pkgrel
virglrenderer)
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)
+ depends=(gcc-libs glib2 libglib-2.0.so libgmodule-2.0.so glibc libcap-ng
libcap-ng.so libseccomp libseccomp.so numactl libnuma.so
qemu-common=$pkgver-$pkgrel)
mv -v $pkgname/* "$pkgdir"
}
