diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux index 2d1757447dd..31a55a3415e 100644 --- a/srcpkgs/incus/files/README.voidlinux +++ b/srcpkgs/incus/files/README.voidlinux @@ -1,6 +1,6 @@ Users wishing to interact with incus system daemons should belong to -the `_incus-admin` and `_incus` groups. The root user should also be -assigned a range of subordinate user and group IDs to be mapped in +either the `_incus-admin` or `_incus` group. The root user should also +be assigned a range of subordinate user and group IDs to be mapped in containers. For example, the command usermod --add-subuids 1000000-1065535 \ diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template index a7c9857c58e..af37776caf8 100644 --- a/srcpkgs/incus/template +++ b/srcpkgs/incus/template @@ -1,6 +1,6 @@ # Template file for 'incus' pkgname=incus -version=6.5.0 +version=6.6.0 revision=1 build_style=go build_helper=qemu @@ -11,13 +11,14 @@ make_check_args="-skip TestConvertNetworkConfig" hostmakedepends="pkg-config" makedepends="lxc-devel acl-devel cowsql-devel raft-devel libcap-devel libuv-devel sqlite-devel eudev-libudev-devel" -depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs" +depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs + ${pkgname}-client-${version}_${revision}" short_desc="Powerful system container and virtual machine manager" maintainer="dkwo " license="Apache-2.0" homepage="https://linuxcontainers.org/incus" distfiles="https://github.com/lxc/incus/archive/refs/tags/v${version}.tar.gz" -checksum=aabc762bdcfe210b777e6b78e40150c9ffbc798aa39c8b4ba55812dac3ada0ec +checksum=0274f6258591a3189737812228722d5c7b0cc57deb5edd0f65750d3323210394 system_groups="_incus-admin _incus" make_dirs=" /var/lib/incus 0755 root root @@ -38,6 +39,7 @@ post_install() { vinstall "${f}" 700 usr/libexec/incus && rm "${f}" done vsv incus + vsv incus-user # avoid conflict with lxd, lxd-lts mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus} @@ -57,10 +59,8 @@ post_install() { incus-client_package() { short_desc+=" - client" - depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/bin/incus - vsv incus-user for shell in bash fish zsh; do vcompletion scripts/${shell}-completion ${shell} incus done