Morten Linderud pushed to branch main at Arch Linux / Packaging / Packages /
incus
Commits:
d086555e by Morten Linderud at 2024-09-20T12:01:17+02:00
upgpkg: 6.5-2: patch qemu 9.1 compat issues
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = incus
pkgdesc = Powerful system container and virtual machine manager
pkgver = 6.5
- pkgrel = 1
+ pkgrel = 2
url = https://linuxcontainers.org/incus/
arch = x86_64
license = Apache-2.0
@@ -44,6 +44,11 @@ pkgbase = incus
source = incus-user.socket
source = incus-user.service
source = incus.sysusers
+ source =
incus-o-direct.patch::https://github.com/lxc/incus/commit/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
+ source =
incus-o-direct-conditional.patch::https://github.com/lxc/incus/commit/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch
+ source =
incus-force-threads.patch::https://github.com/lxc/incus/commit/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch
+ source =
incus-remove-deprecated-fd.patch::https://github.com/lxc/incus/commit/4acc15c0dcab2fe4c076eb8422bc1215fc5d4d7a.patch
+ source =
incus-apparmror-rawio.patch::https://github.com/lxc/incus/commit/b77c1ee8aca2da814a534ad45ab21223a0f8faf5.patch
validpgpkeys = 602F567663E593BCBD14F338C638974D64792D67
sha256sums =
d79d76c42c430b0346f25fee1059dbe0ab0db2319faaa6e0eeb6ad3982023662
sha256sums = SKIP
@@ -52,6 +57,11 @@ pkgbase = incus
sha256sums =
50288528ea910d186157a2515c5200b3b073f645922fb581d1913f236f14667d
sha256sums =
1c934cac1aa61be2ede5830ea76dbb9ba199498f6eb920ce1016bbb54dd088bf
sha256sums =
90beead5dbde947936a58df8773519c49d92a2028881ae0ec81ee5402510e39a
+ sha256sums =
61ece65bb584372cf7f3ed7076c3e10f8c54fc4170187a15a08e102b8d71d954
+ sha256sums =
4058744cc1b2a0862ddca2200f0dba7f4f2f464ba2b0c75ec10698cf2dc24722
+ sha256sums =
d713dad6875062ebf55a9c049ff68117b38545cd682b6933512d5a684122aa32
+ sha256sums =
e458a5b83bacc8ec4345d92e2940598bc6b6c641a3d595b335c4c7296a9a4795
+ sha256sums =
18e428fd2fe376190ea6bed4a7eba323e9077884c69bd9fba68ecb131304ddba
pkgname = incus
=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@
pkgbase=incus
pkgname=(incus incus-tools)
pkgver=6.5
-pkgrel=1
+pkgrel=2
pkgdesc="Powerful system container and virtual machine manager"
arch=('x86_64')
url="https://linuxcontainers.org/incus/";
@@ -37,7 +37,20 @@
source=("https://linuxcontainers.org/downloads/incus/incus-$pkgver.tar.xz"{,.asc
"incus.service"
"incus-user.socket"
"incus-user.service"
- "incus.sysusers")
+ "incus.sysusers"
+ # qemu 9.1 patches
+
+ # [PATCH] incusd/instance/qemu: Set O_DIRECT when passing in FDs
+
"$pkgname-o-direct.patch::https://github.com/lxc/incus/commit/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch";
+ # [PATCH] incusd/instance/qemu: Make O_DIRECT conditional on
+
"$pkgname-o-direct-conditional.patch::https://github.com/lxc/incus/commit/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch";
+ # [PATCH] incusd/instance/qemu: Force threads I/O mode for
+
"$pkgname-force-threads.patch::https://github.com/lxc/incus/commit/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch";
+ # [PATCH] incusd/instance/qemu: Move away from deprecated fd: syntax
+
"$pkgname-remove-deprecated-fd.patch::https://github.com/lxc/incus/commit/4acc15c0dcab2fe4c076eb8422bc1215fc5d4d7a.patch";
+ # [PATCH] incusd/apparmor: Add sys_rawio for QEMU 9.1
+
"$pkgname-apparmror-rawio.patch::https://github.com/lxc/incus/commit/b77c1ee8aca2da814a534ad45ab21223a0f8faf5.patch";
+ )
validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67' # Stéphane Graber
<[email protected]>
)
sha256sums=('d79d76c42c430b0346f25fee1059dbe0ab0db2319faaa6e0eeb6ad3982023662'
@@ -46,13 +59,24 @@
sha256sums=('d79d76c42c430b0346f25fee1059dbe0ab0db2319faaa6e0eeb6ad3982023662'
'28e99ff6333aec1dd1cac539f7664cbf855ddcbea9de4a0fea6247979b10e28f'
'50288528ea910d186157a2515c5200b3b073f645922fb581d1913f236f14667d'
'1c934cac1aa61be2ede5830ea76dbb9ba199498f6eb920ce1016bbb54dd088bf'
- '90beead5dbde947936a58df8773519c49d92a2028881ae0ec81ee5402510e39a')
+ '90beead5dbde947936a58df8773519c49d92a2028881ae0ec81ee5402510e39a'
+ '61ece65bb584372cf7f3ed7076c3e10f8c54fc4170187a15a08e102b8d71d954'
+ '4058744cc1b2a0862ddca2200f0dba7f4f2f464ba2b0c75ec10698cf2dc24722'
+ 'd713dad6875062ebf55a9c049ff68117b38545cd682b6933512d5a684122aa32'
+ 'e458a5b83bacc8ec4345d92e2940598bc6b6c641a3d595b335c4c7296a9a4795'
+ '18e428fd2fe376190ea6bed4a7eba323e9077884c69bd9fba68ecb131304ddba')
prepare() {
cd "$pkgbase-${pkgver}"
mkdir bin
go mod verify
+
+ patch -Np1 < "$srcdir/incus-o-direct.patch"
+ patch -Np1 < "$srcdir/incus-o-direct-conditional.patch"
+ patch -Np1 < "$srcdir/incus-force-threads.patch"
+ patch -Np1 < "$srcdir/incus-remove-deprecated-fd.patch"
+ patch -Np1 < "$srcdir/incus-apparmror-rawio.patch"
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/incus/-/commit/d086555e33cb1e92fc03d41b218378bb95b0ae65
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/incus/-/commit/d086555e33cb1e92fc03d41b218378bb95b0ae65
You're receiving this email because of your account on gitlab.archlinux.org.
