Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] incus: update to 6.1
@ 2024-05-08 23:22 dkwo
  2024-05-09 14:09 ` dkwo
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: dkwo @ 2024-05-08 23:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages incus
https://github.com/void-linux/void-packages/pull/50251

incus: update to 6.1
I still need to test this.

A patch file from https://github.com/void-linux/void-packages/pull/50251.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-50251.patch --]
[-- Type: text/x-diff, Size: 1832 bytes --]

From ba674d0453ff5c97d30597feba1896b896d3e131 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 May 2024 15:20:25 -0400
Subject: [PATCH] incus: update to 6.1

---
 srcpkgs/incus/template | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7ff722c779c059..176c917e6aaf82 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,9 +1,10 @@
 # Template file for 'incus'
 pkgname=incus
-version=0.6.0
-revision=2
+version=6.1.0
+revision=1
 build_style=go
-go_import_path=github.com/lxc/incus
+build_helper=qemu
+go_import_path=github.com/lxc/incus/v6
 go_build_tags="libsqlite3"
 go_package="${go_import_path}/cmd/incus
  ${go_import_path}/cmd/incus-benchmark
@@ -20,7 +21,7 @@ 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=9bbce9ae95b40be4bd11116a97f422ecd2adf2915a2c0b6828fa34435de756d2
+checksum=c8a492b7927f92bb2c3c7c372b8ac06d4b68fd761c9b9a4da9f853a031742ca4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -47,6 +48,12 @@ post_install() {
 	vsv incus
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+
+	# generate shell completions
+	INCUS=${DESTDIR}/usr/bin/incus
+	for shell in bash fish zsh; do
+		vtargetrun ${INCUS} completion ${shell} > scripts/${shell}-completion
+	done
 }
 
 incus-client_package() {
@@ -55,7 +62,9 @@ incus-client_package() {
 	pkg_install() {
 		vmove usr/bin/incus
 		vsv incus-user
-		vcompletion scripts/bash/incus bash incus
+		for shell in bash fish zsh; do
+			vcompletion scripts/${shell}-completion ${shell} incus
+		done
 	}
 }
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
@ 2024-05-09 14:09 ` dkwo
  2024-05-09 20:19 ` [PR PATCH] [Updated] " dkwo
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-05-09 14:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2102737986

Comment:
to do: add a readme.void mentioning incus groups, subpackages and perhaps
`echo "root:1000000:1000000000" | doas tee -a /etc/subuid /etc/subgid`
and maybe also set CGROUP_MODE in rc.conf to unified instead of hybrid.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
  2024-05-09 14:09 ` dkwo
@ 2024-05-09 20:19 ` dkwo
  2024-05-11 21:53 ` dkwo
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-05-09 20:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages incus
https://github.com/void-linux/void-packages/pull/50251

incus: update to 6.1
I still need to test this.

A patch file from https://github.com/void-linux/void-packages/pull/50251.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-50251.patch --]
[-- Type: text/x-diff, Size: 4155 bytes --]

From 2f9abdb743f4353e0cd19f339f62790cebd04b16 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 May 2024 15:20:25 -0400
Subject: [PATCH] incus: update to 6.1, include readme.void and upstream patch
 for 32bit

---
 srcpkgs/incus/files/README.voidlinux | 11 +++++++++++
 srcpkgs/incus/patches/32bit.patch    | 27 +++++++++++++++++++++++++++
 srcpkgs/incus/template               | 21 ++++++++++++++++-----
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/incus/files/README.voidlinux
 create mode 100644 srcpkgs/incus/patches/32bit.patch

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
new file mode 100644
index 00000000000000..4e82bff81af9c2
--- /dev/null
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -0,0 +1,11 @@
+Besides the incus package, at least the incus-client one is needed,
+and possibly the incus-tools one.
+Membership in the _incus-admin and _incus groups is also needed to
+interact with the corresponding services, which need to be started.
+
+Similar to lxc/lxd, something like
+
+echo "root:1000000:1000000000" | doas tee -a /etc/subuid /etc/subgid
+
+should be setup.  One may also want to set CGROUP_MODE in rc.conf to
+unified instead of hybrid.
diff --git a/srcpkgs/incus/patches/32bit.patch b/srcpkgs/incus/patches/32bit.patch
new file mode 100644
index 00000000000000..68805609506be4
--- /dev/null
+++ b/srcpkgs/incus/patches/32bit.patch
@@ -0,0 +1,27 @@
+From 9c733bccf04e717b6497534d616e83f5e947304a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
+Date: Thu, 9 May 2024 10:11:39 -0400
+Subject: [PATCH] incusd/instance: Fix building on 32bit architectures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #861
+
+Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
+---
+ internal/server/instance/drivers/driver_common.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/internal/server/instance/drivers/driver_common.go b/internal/server/instance/drivers/driver_common.go
+index 352555400f..faef632ccc 100644
+--- a/internal/server/instance/drivers/driver_common.go
++++ b/internal/server/instance/drivers/driver_common.go
+@@ -1536,5 +1536,5 @@ func (d *common) processStartedAt(pid int) (time.Time, error) {
+ 		return time.Time{}, fmt.Errorf("Bad stat type")
+ 	}
+ 
+-	return time.Unix(linuxInfo.Ctim.Sec, linuxInfo.Ctim.Nsec), nil
++	return time.Unix(int64(linuxInfo.Ctim.Sec), int64(linuxInfo.Ctim.Nsec)), nil
+ }
+
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7ff722c779c059..2bfb41239ab7fd 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,9 +1,10 @@
 # Template file for 'incus'
 pkgname=incus
-version=0.6.0
-revision=2
+version=6.1.0
+revision=1
 build_style=go
-go_import_path=github.com/lxc/incus
+build_helper=qemu
+go_import_path=github.com/lxc/incus/v6
 go_build_tags="libsqlite3"
 go_package="${go_import_path}/cmd/incus
  ${go_import_path}/cmd/incus-benchmark
@@ -20,7 +21,7 @@ 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=9bbce9ae95b40be4bd11116a97f422ecd2adf2915a2c0b6828fa34435de756d2
+checksum=c8a492b7927f92bb2c3c7c372b8ac06d4b68fd761c9b9a4da9f853a031742ca4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -47,6 +48,14 @@ post_install() {
 	vsv incus
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+
+	# generate shell completions
+	INCUS=${DESTDIR}/usr/bin/incus
+	for shell in bash fish zsh; do
+		vtargetrun ${INCUS} completion ${shell} > scripts/${shell}-completion
+	done
+
+	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
@@ -55,7 +64,9 @@ incus-client_package() {
 	pkg_install() {
 		vmove usr/bin/incus
 		vsv incus-user
-		vcompletion scripts/bash/incus bash incus
+		for shell in bash fish zsh; do
+			vcompletion scripts/${shell}-completion ${shell} incus
+		done
 	}
 }
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
  2024-05-09 14:09 ` dkwo
  2024-05-09 20:19 ` [PR PATCH] [Updated] " dkwo
@ 2024-05-11 21:53 ` dkwo
  2024-05-23  0:29 ` dkwo
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-05-11 21:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2102737986

Comment:
to do: add a readme.void mentioning incus groups, subpackages and perhaps
`echo "root:1000000:1000000000" | doas tee -a /etc/subuid /etc/subgid`
and maybe also set CGROUP_MODE in rc.conf to unified instead of hybrid.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (2 preceding siblings ...)
  2024-05-11 21:53 ` dkwo
@ 2024-05-23  0:29 ` dkwo
  2024-06-04 19:09 ` sbromberger
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-05-23  0:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2125986542

Comment:
@ahesford can you take a look at this one as well?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (3 preceding siblings ...)
  2024-05-23  0:29 ` dkwo
@ 2024-06-04 19:09 ` sbromberger
  2024-06-04 20:00 ` [PR REVIEW] " ahesford
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: sbromberger @ 2024-06-04 19:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by sbromberger on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2148220443

Comment:
Hi all,

6.2 was just released - any way we might just bump the version here?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (5 preceding siblings ...)
  2024-06-04 20:00 ` [PR REVIEW] " ahesford
@ 2024-06-04 20:00 ` ahesford
  2024-06-05 12:29 ` [PR PATCH] [Updated] " dkwo
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2024-06-04 20:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#discussion_r1626539935

Comment:
```suggestion
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
containers. For example, the command

    usermod --add-subuids 1000000-1065535 \
        --add-subgids 1000000-1065535 root
        
will assign a range of 65,536 IDs for users and groups.

Some container configurations may require that the `CGROUP_MODE`
variable in `/etc/rc.conf` be set to `unified`.
```

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (4 preceding siblings ...)
  2024-06-04 19:09 ` sbromberger
@ 2024-06-04 20:00 ` ahesford
  2024-06-04 20:00 ` ahesford
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2024-06-04 20:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#discussion_r1626532330

Comment:
Convention dictates that this be named in lowercase, and should be declared local in any case.
```suggestion
	local incus=${DESTDIR}/usr/bin/incus
```

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (6 preceding siblings ...)
  2024-06-04 20:00 ` ahesford
@ 2024-06-05 12:29 ` dkwo
  2024-06-05 12:30 ` dkwo
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-06-05 12:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages incus
https://github.com/void-linux/void-packages/pull/50251

incus: update to 6.1
Tested.

A patch file from https://github.com/void-linux/void-packages/pull/50251.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-50251.patch --]
[-- Type: text/x-diff, Size: 2730 bytes --]

From ad2b110937944db19b52dc1530f3d464bea683ee Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 May 2024 15:20:25 -0400
Subject: [PATCH] incus: update to 6.2

---
 srcpkgs/incus/files/README.voidlinux | 11 +++++++++++
 srcpkgs/incus/template               | 21 ++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/incus/files/README.voidlinux

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
new file mode 100644
index 00000000000000..3a4a5b356f49a9
--- /dev/null
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -0,0 +1,11 @@
+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
+containers. For example, the command
+
+	usermod --add-subuids 1000000-1065535 \
+		--add-subgids 1000000-1065535 root
+
+will assign a range of 65,536 IDs for users and groups.
+Some container configurations may require that the `CGROUP_MODE`
+variable in `/etc/rc.conf` be set to `unified`.
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7ff722c779c059..ee696e1557ae5d 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,9 +1,10 @@
 # Template file for 'incus'
 pkgname=incus
-version=0.6.0
-revision=2
+version=6.2.0
+revision=1
 build_style=go
-go_import_path=github.com/lxc/incus
+build_helper=qemu
+go_import_path=github.com/lxc/incus/v6
 go_build_tags="libsqlite3"
 go_package="${go_import_path}/cmd/incus
  ${go_import_path}/cmd/incus-benchmark
@@ -20,7 +21,7 @@ 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=9bbce9ae95b40be4bd11116a97f422ecd2adf2915a2c0b6828fa34435de756d2
+checksum=3593bd8ffd18d347615f451fddcc9658a65e47d4812461cceb9f61c49f568231
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -47,6 +48,14 @@ post_install() {
 	vsv incus
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+
+	# generate shell completions
+	local incus=${DESTDIR}/usr/bin/incus
+	for shell in bash fish zsh; do
+		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	done
+
+	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
@@ -55,7 +64,9 @@ incus-client_package() {
 	pkg_install() {
 		vmove usr/bin/incus
 		vsv incus-user
-		vcompletion scripts/bash/incus bash incus
+		for shell in bash fish zsh; do
+			vcompletion scripts/${shell}-completion ${shell} incus
+		done
 	}
 }
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (7 preceding siblings ...)
  2024-06-05 12:29 ` [PR PATCH] [Updated] " dkwo
@ 2024-06-05 12:30 ` dkwo
  2024-06-05 12:40 ` [PR REVIEW] " dkwo
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-06-05 12:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2149715810

Comment:
Thanks!  Implemented the suggestions and updated to 6.2


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (8 preceding siblings ...)
  2024-06-05 12:30 ` dkwo
@ 2024-06-05 12:40 ` dkwo
  2024-06-05 12:40 ` dkwo
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-06-05 12:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#discussion_r1627685401

Comment:
done.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (9 preceding siblings ...)
  2024-06-05 12:40 ` [PR REVIEW] " dkwo
@ 2024-06-05 12:40 ` dkwo
  2024-06-05 12:42 ` dkwo
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-06-05 12:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#discussion_r1627685603

Comment:
done

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.1
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (10 preceding siblings ...)
  2024-06-05 12:40 ` dkwo
@ 2024-06-05 12:42 ` dkwo
  2024-06-05 17:17 ` [PR PATCH] [Updated] incus: update to 6.2 dkwo
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-06-05 12:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2149753691

Comment:
Still failing on 32 bit. I thought that patch had been merged in v6.2
is anyone actually using incus on those archs? I wonder if it's worth it supporting them..

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] incus: update to 6.2
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (11 preceding siblings ...)
  2024-06-05 12:42 ` dkwo
@ 2024-06-05 17:17 ` dkwo
  2024-06-05 17:22 ` dkwo
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-06-05 17:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages incus
https://github.com/void-linux/void-packages/pull/50251

incus: update to 6.2
Tested.

A patch file from https://github.com/void-linux/void-packages/pull/50251.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-50251.patch --]
[-- Type: text/x-diff, Size: 4809 bytes --]

From ad2b110937944db19b52dc1530f3d464bea683ee Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 May 2024 15:20:25 -0400
Subject: [PATCH 1/2] incus: update to 6.2

---
 srcpkgs/incus/files/README.voidlinux | 11 +++++++++++
 srcpkgs/incus/template               | 21 ++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/incus/files/README.voidlinux

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
new file mode 100644
index 00000000000000..3a4a5b356f49a9
--- /dev/null
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -0,0 +1,11 @@
+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
+containers. For example, the command
+
+	usermod --add-subuids 1000000-1065535 \
+		--add-subgids 1000000-1065535 root
+
+will assign a range of 65,536 IDs for users and groups.
+Some container configurations may require that the `CGROUP_MODE`
+variable in `/etc/rc.conf` be set to `unified`.
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7ff722c779c059..ee696e1557ae5d 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,9 +1,10 @@
 # Template file for 'incus'
 pkgname=incus
-version=0.6.0
-revision=2
+version=6.2.0
+revision=1
 build_style=go
-go_import_path=github.com/lxc/incus
+build_helper=qemu
+go_import_path=github.com/lxc/incus/v6
 go_build_tags="libsqlite3"
 go_package="${go_import_path}/cmd/incus
  ${go_import_path}/cmd/incus-benchmark
@@ -20,7 +21,7 @@ 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=9bbce9ae95b40be4bd11116a97f422ecd2adf2915a2c0b6828fa34435de756d2
+checksum=3593bd8ffd18d347615f451fddcc9658a65e47d4812461cceb9f61c49f568231
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -47,6 +48,14 @@ post_install() {
 	vsv incus
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+
+	# generate shell completions
+	local incus=${DESTDIR}/usr/bin/incus
+	for shell in bash fish zsh; do
+		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	done
+
+	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 incus-client_package() {
@@ -55,7 +64,9 @@ incus-client_package() {
 	pkg_install() {
 		vmove usr/bin/incus
 		vsv incus-user
-		vcompletion scripts/bash/incus bash incus
+		for shell in bash fish zsh; do
+			vcompletion scripts/${shell}-completion ${shell} incus
+		done
 	}
 }
 

From e0bb85dec8975373fd587abef3d3477b9e72a3b0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 5 Jun 2024 13:17:11 -0400
Subject: [PATCH 2/2] incus: patch for 32bit

---
 srcpkgs/incus/patches/32bit.patch | 40 +++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/incus/patches/32bit.patch

diff --git a/srcpkgs/incus/patches/32bit.patch b/srcpkgs/incus/patches/32bit.patch
new file mode 100644
index 00000000000000..533729d06820b4
--- /dev/null
+++ b/srcpkgs/incus/patches/32bit.patch
@@ -0,0 +1,40 @@
+From f11c0b04f2e90a19e900ca077e21edf02c589db2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
+Date: Wed, 5 Jun 2024 11:35:50 -0400
+Subject: [PATCH] incusd/seccomp: Fix sysinfo logic on 32bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #918
+
+Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
+---
+ internal/server/seccomp/sysinfo_32.go | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/internal/server/seccomp/sysinfo_32.go b/internal/server/seccomp/sysinfo_32.go
+index 56bcd23ace..0445473147 100644
+--- a/internal/server/seccomp/sysinfo_32.go
++++ b/internal/server/seccomp/sysinfo_32.go
+@@ -8,13 +8,13 @@ import (
+ 
+ // ToNative fills fields from s into native fields.
+ func (s *Sysinfo) ToNative(n *unix.Sysinfo_t) {
+-	n.Bufferram = uint32(s.Bufferram / s.Unit)
+-	n.Freeram = uint32(s.Freeram / s.Unit)
+-	n.Freeswap = uint32(s.Freeswap / s.Unit)
++	n.Bufferram = uint32(s.Bufferram) / s.Unit
++	n.Freeram = uint32(s.Freeram) / s.Unit
++	n.Freeswap = uint32(s.Freeswap) / s.Unit
+ 	n.Procs = s.Procs
+-	n.Sharedram = uint32(s.Sharedram / s.Unit)
+-	n.Totalram = uint32(s.Totalram / s.Unit)
+-	n.Totalswap = uint32(s.Totalswap / s.Unit)
++	n.Sharedram = uint32(s.Sharedram) / s.Unit
++	n.Totalram = uint32(s.Totalram) / s.Unit
++	n.Totalswap = uint32(s.Totalswap) / s.Unit
+ 	n.Uptime = int32(s.Uptime)
+ 	n.Unit = uint32(s.Unit)
+ }
+

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.2
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (12 preceding siblings ...)
  2024-06-05 17:17 ` [PR PATCH] [Updated] incus: update to 6.2 dkwo
@ 2024-06-05 17:22 ` dkwo
  2024-06-06 20:27 ` dkwo
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-06-05 17:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2150579526

Comment:
the patch fixes 32 bit. i'll leave this as draft until it is merged upstream.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.2
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (13 preceding siblings ...)
  2024-06-05 17:22 ` dkwo
@ 2024-06-06 20:27 ` dkwo
  2024-06-06 20:42 ` [PR PATCH] [Merged]: " ahesford
  2024-06-06 22:11 ` sbromberger
  16 siblings, 0 replies; 18+ messages in thread
From: dkwo @ 2024-06-06 20:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2153351960

Comment:
patch now merged upstream.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Merged]: incus: update to 6.2
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (14 preceding siblings ...)
  2024-06-06 20:27 ` dkwo
@ 2024-06-06 20:42 ` ahesford
  2024-06-06 22:11 ` sbromberger
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2024-06-06 20:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

There's a merged pull request on the void-packages repository

incus: update to 6.2
https://github.com/void-linux/void-packages/pull/50251

Description:
Tested.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: incus: update to 6.2
  2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
                   ` (15 preceding siblings ...)
  2024-06-06 20:42 ` [PR PATCH] [Merged]: " ahesford
@ 2024-06-06 22:11 ` sbromberger
  16 siblings, 0 replies; 18+ messages in thread
From: sbromberger @ 2024-06-06 22:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New comment by sbromberger on void-packages repository

https://github.com/void-linux/void-packages/pull/50251#issuecomment-2153485631

Comment:
Thank you both!

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2024-06-06 22:11 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-08 23:22 [PR PATCH] incus: update to 6.1 dkwo
2024-05-09 14:09 ` dkwo
2024-05-09 20:19 ` [PR PATCH] [Updated] " dkwo
2024-05-11 21:53 ` dkwo
2024-05-23  0:29 ` dkwo
2024-06-04 19:09 ` sbromberger
2024-06-04 20:00 ` [PR REVIEW] " ahesford
2024-06-04 20:00 ` ahesford
2024-06-05 12:29 ` [PR PATCH] [Updated] " dkwo
2024-06-05 12:30 ` dkwo
2024-06-05 12:40 ` [PR REVIEW] " dkwo
2024-06-05 12:40 ` dkwo
2024-06-05 12:42 ` dkwo
2024-06-05 17:17 ` [PR PATCH] [Updated] incus: update to 6.2 dkwo
2024-06-05 17:22 ` dkwo
2024-06-06 20:27 ` dkwo
2024-06-06 20:42 ` [PR PATCH] [Merged]: " ahesford
2024-06-06 22:11 ` sbromberger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).