Skip to content

Commit 2e911ee

Browse files
duskmossahesford
authored andcommitted
incus: update to 6.6, restructure subpackages
The incus-user service belongs in the server package, and the client subpackage should not require the server for installation. Closes: #52384 [via git-merge-pr]
1 parent e83b6e2 commit 2e911ee

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

srcpkgs/incus/files/README.voidlinux

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Users wishing to interact with incus system daemons should belong to
2-
the `_incus-admin` and `_incus` groups. The root user should also be
3-
assigned a range of subordinate user and group IDs to be mapped in
2+
either the `_incus-admin` or `_incus` group. The root user should also
3+
be assigned a range of subordinate user and group IDs to be mapped in
44
containers. For example, the command
55

66
usermod --add-subuids 1000000-1065535 \

srcpkgs/incus/template

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'incus'
22
pkgname=incus
3-
version=6.5.0
3+
version=6.6.0
44
revision=1
55
build_style=go
66
build_helper=qemu
@@ -11,13 +11,14 @@ make_check_args="-skip TestConvertNetworkConfig"
1111
hostmakedepends="pkg-config"
1212
makedepends="lxc-devel acl-devel cowsql-devel raft-devel
1313
libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
14-
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs"
14+
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs
15+
${pkgname}-client-${version}_${revision}"
1516
short_desc="Powerful system container and virtual machine manager"
1617
maintainer="dkwo <[email protected]>"
1718
license="Apache-2.0"
1819
homepage="https://linuxcontainers.org/incus"
1920
distfiles="https://github.com/lxc/incus/archive/refs/tags/v${version}.tar.gz"
20-
checksum=aabc762bdcfe210b777e6b78e40150c9ffbc798aa39c8b4ba55812dac3ada0ec
21+
checksum=0274f6258591a3189737812228722d5c7b0cc57deb5edd0f65750d3323210394
2122
system_groups="_incus-admin _incus"
2223
make_dirs="
2324
/var/lib/incus 0755 root root
@@ -38,6 +39,7 @@ post_install() {
3839
vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
3940
done
4041
vsv incus
42+
vsv incus-user
4143

4244
# avoid conflict with lxd, lxd-lts
4345
mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
@@ -57,10 +59,8 @@ post_install() {
5759

5860
incus-client_package() {
5961
short_desc+=" - client"
60-
depends="${sourcepkg}>=${version}_${revision}"
6162
pkg_install() {
6263
vmove usr/bin/incus
63-
vsv incus-user
6464
for shell in bash fish zsh; do
6565
vcompletion scripts/${shell}-completion ${shell} incus
6666
done

0 commit comments

Comments
 (0)