Skip to content

Commit

Permalink
incus: update to 6.6, restructure subpackages
Browse files Browse the repository at this point in the history
The incus-user service belongs in the server package, and the client
subpackage should not require the server for installation.

Closes: void-linux#52384 [via git-merge-pr]
  • Loading branch information
duskmoss authored and ahesford committed Oct 6, 2024
1 parent e83b6e2 commit 2e911ee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions srcpkgs/incus/files/README.voidlinux
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions srcpkgs/incus/template
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 <npiazza@disroot.org>"
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
Expand All @@ -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}
Expand All @@ -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
Expand Down

0 comments on commit 2e911ee

Please sign in to comment.