[PR PATCH] incus: update to 6.4.0

[PR PATCH] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 407 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From 440cf3abfc53d3c4a0db5c95712ced98a90d7d35 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 9817b751601af0..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=4
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 412 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From 142b93502c5baf6972e6741ee66718029812f2b2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

Re: incus: update to 6.4.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2306110405

Comment:
could we list the optdeps in readme.voidlinux? https://github.com/void-linux/void-packages/issues/49267#issuecomment-2302957083

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2313232400

Comment:
Opt deps I know about that would be nice to have documented in the readme, I'm not sure if I'm missing one for vm support or if something else is going on.

OCI support *confirmed working*
* `spokeo` `umoci`

VM support *not working yet, but incus does recognize qemu support and tries to launch*
 * `qemu` `edk2-ovmf`
 * Add  `export INCUS_EDK2_PATH=/usr/share/edk2/x64/ ` to a conf file in the incus service directory

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2316230233

Comment:
Got VM's working. 

The remaining issue was no "OVMF_CODE.secboot.4m.fd" looks like we don't package this in edk2-ovmf @classabbyamp is there a specific reason not to? 

But setting "security.secureboot" on a vm instance or on a profile they're attached to allows vms to be started.

Re: incus: update to 6.4.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2316236694

Comment:
they're called something else:
```
/usr/share/edk2/ia32/OVMF_CODE.secure.4m.fd
/usr/share/edk2/ia32/OVMF_CODE.secure.fd
/usr/share/edk2/x64/OVMF_CODE.secure.4m.fd
/usr/share/edk2/x64/OVMF_CODE.secure.fd
```

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2316230233

Comment:
Edit: spoke too soon

The remaining issue is no "OVMF_CODE.secboot.4m.fd" looks like we don't package this in edk2-ovmf @classabbyamp is there a specific reason not to? 

But setting "security.secureboot" on a vm instance or on a profile they're attached to allows vms to be started. 

edit: They're started but they're not booting up properly still.  apparently hanging on loading inital ramdisk another round of debugging. 

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2316248585

Comment:
> they're called something else:
> 
> ```
> /usr/share/edk2/ia32/OVMF_CODE.secure.4m.fd
> /usr/share/edk2/ia32/OVMF_CODE.secure.fd
> /usr/share/edk2/x64/OVMF_CODE.secure.4m.fd
> /usr/share/edk2/x64/OVMF_CODE.secure.fd
> ```

thanks.! I'll look into if theres a way of configuring incus to find them. 

symlinking them allows incus to start vm instances with secury.secureboot=true , but same hang on ramdisk I mentioned in my edit above. 

Should I start a different thread to track progress here? Maybe letting the version bump go through and adding optional deps to the readme in a  new pull request once they're more identified.

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2316230233

Comment:
Edit: spoke too soon

The remaining issue is no "OVMF_CODE.secboot.4m.fd" looks like we don't package this in edk2-ovmf @classabbyamp is there a specific reason not to? 

But setting "security.secureboot" to false on a vm instance or on a profile they're attached to allows vms to be started. 

edit: They're started but they're not booting up properly still.  apparently hanging on loading inital ramdisk another round of debugging. 

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2317780083

Comment:
@rekh127 Can you try adding `virtiofsd`? I haven't tested vm or oci myself yet, but https://linuxcontainers.org/incus/docs/main/installing/#install-incus-from-source mentions that for alpine.

So it seems we could use a conf file for the service, or at least export some variables in the service.

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2318642313

Comment:
> @rekh127 Can you try adding `virtiofsd`? I haven't tested vm or oci myself yet, but https://linuxcontainers.org/incus/docs/main/installing/#install-incus-from-source mentions that for alpine.

No change. but maybe later I'll try and go through the alpine list of dependencies for their incus-vm package and see if I can figure anything out


>So it seems we could use a conf file for the service, or at least export some variables in the service.

Yes I think at minimum we should add the EDK2 path.


https://github.com/zabbly/incus/blob/daily/systemd/incusd

These are the ones the maintainer uses in his packaged version, we could consider some. I've added the UI path for mine to play with the web ui (grabbed from his deb package).  Incus-agent is probably useful as well, but we will need to package incus-agent for it (it's like qemu guest agent, but for incus specifically).

I can start working on a new pull request to land after this one for conf file and documenting opt deps.  I also intend to make a PR (could combine it) to move the current incus-user/check to incus since it actually checks if incusd is up since it runs as root.  

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2318643857

Comment:
In the mean time I'll test this PR locally as a sanity check :)

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2318666831

Comment:
Re ovmf secure vs secboot, looks like theres no mechanism for changing that, its a list of files in incus code. https://github.com/lxc/incus/blob/0bf83c3be3f3c1d883ba40b27c29874d7fcee1cd/internal/server/instance/drivers/edk2/driver_edk2.go#L95

looks like arch fedora and debian all call the files  'secboot' too
@classabbyamp  should we consider matching?

We could also maybe install a symlink?

Re: incus: update to 6.4.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2318689124

Comment:
just patch incus to use what we call them

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2318841511

Comment:
Isn't that going to be a hassle to maintain, and probably end up needing to patch other vm tools down the road?

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2318883603

Comment:
The author says here https://github.com/lxc/incus/issues/475#issuecomment-1937337215 that those dependencies are enough, if you do the 4 things mentioned there. Doesn't that work for you?

in particular, the part 

> add INCUS_OVMF_PATH=/usr/share/edk2/x64/ to incusd environment, Make sure to disable security.secureboot on VMs

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2318935106

Comment:
> The author says here [lxc/incus#475 (comment)](https://github.com/lxc/incus/issues/475#issuecomment-1937337215) that those dependencies are enough, if you do the 4 things mentioned there. Doesn't that work for you?
> 
> in particular, the part
> 
> > add INCUS_OVMF_PATH=/usr/share/edk2/x64/ to incusd environment, Make sure to disable security.secureboot on VMs

summarizing earlier comments
https://github.com/void-linux/void-packages/pull/51907#issuecomment-2313232400
https://github.com/void-linux/void-packages/pull/51907#issuecomment-2316230233
https://github.com/void-linux/void-packages/pull/51907#issuecomment-2316248585

I have installed those packages and am exporting INCUS_EDK2_PATH=/usr/share/edk2/x64/ in incus service's conf. 

Those plus  disabling secureboot or symlinking "secure" files to "secboot" (since the void package has the name different from other distros)  gets VM's launching. 

However they aren't booting properly, they  get stuck with QEMU using 100% of one core, and the last message on the console is "loading init ramdisK".  

Not sure whether this is an issue that Stéphane missed, thinking when he got launch succeeded that was the end of issues, like I did at first, or if it's a issue he didn't run into.  



As I said before, I don't think this should block updating to 6.4. And I would like to start a pull request to go in after this one for the CONF file, and documenting opt deps if you're okay with that.

Re: incus: update to 6.4.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2318968501

Comment:
pretty sure there's another distro using secure in the filename, i consulted several other distro packages when writing the edk2-ovmf package

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2319032864

Comment:
Well, in his case he could exec bash (you see he gets a shell), while now for me `incus exec v1 bash` errors with "VM agent isn't currently running", even though status is running, and core also at 100%.

As for conf file, the service already sources conf file, so isn't it up to the user to edit conf?

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2319043633

Comment:
> Well, in his case he could exec bash (you see he gets a shell), while now for me `incus exec v1 bash` errors with "VM agent isn't currently running", even though status is running, and core also at 100%.
 
 
 oops yep I missed that. 

>As for conf file, the service already sources conf file, so isn't it up to the user to edit conf?

 I would suggest we either document it with the opt deps in the readme, or add the . Adding the default makes sense to me, since it makes it discoverable, and it's also the one that will need to be set for all users using ovmf from packages. 

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2319057963

Comment:
I can document everything in the readme, but I'd like to figure out why vm gets stuck first..

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322198495

Comment:
Ok, so if I downgrade `edk2-ovmf` to 202311 then the alpine/edge vm starts just fine.

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 412 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From fca6f0a6e53b3dc7fff68003cd10d5baf791967b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH 1/3] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

From d6cd1fdfd26bfd9c0f3ee07e00b1c39bca74e393 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:32:26 -0400
Subject: [PATCH 2/3] incus: move check from incus-user to incus

---
 srcpkgs/incus/files/{incus-user => incus}/check | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check

From a95d9e885eeb595dbca647c725d6e8271754f6bf Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:43:27 -0400
Subject: [PATCH 3/3] incus: expand readme for VM

---
 srcpkgs/incus/files/README.voidlinux | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..02523e10306cbf 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,7 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies to run VMs: `qemu` `edk2-ovmf`.  Must also export
+INCUS_EDK2_PATH=/usr/share/edk2/x64 in incus service conf file.

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 490 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

To do: figure out what breaks with newer edk2, patch incus for secureboot.

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

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

From 2c799b59648de3d2b264e646df7e5628e093c793 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH 1/3] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

From f619dd5eb20b452d56ba572c772e721efbf2ecef Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:32:26 -0400
Subject: [PATCH 2/3] incus: move check from incus-user to incus

---
 srcpkgs/incus/files/{incus-user => incus}/check | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check

From 4dcc42aa7be46c7221bd1e0720fe581f81dcdbd5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:43:27 -0400
Subject: [PATCH 3/3] incus: expand readme for opt deps

---
 srcpkgs/incus/files/README.voidlinux | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..384c42d02d76b3 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,13 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+- To run VMs install `qemu` `edk2-ovmf` and export
+INCUS_EDK2_PATH=/usr/share/edk2/x64 in incus service conf file.  The
+option `security.secureboot=false` is needed until incus or edk2-ovmf
+are patched to be compatible.
+
+- To run OCI install `spokeo` `umoci`.

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322303060

Comment:
The 202402 still works, but 202405 breaks vm.
@classabbyamp Is it possble to downgrade it, if people care about vm in incus?
@rekh127 I'll take your word for oci, have not tested it myself.
For now, I can put in the readme a note about disabling secureboot, and we can patch incus later.

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322333810

Comment:
Do you not want to add something about linking the secure boot files as I have in my PR?

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322498506

Comment:
I don't like to edit stuff in /usr/share by hand: we should either fix incus or edk2 imo.

Re: incus: update to 6.4.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322791224

Comment:
does #52057 work? what architecture (i.e., could this be an aarch64 cross issue)?

changelog for 202405 is not huge: https://github.com/tianocore/edk2/releases/tag/edk2-stable202405

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322861907

Comment:
The first broken commit is https://github.com/void-linux/void-packages/commit/0b8d631e8b5ea20750f6c64c6417161f3935c142 the update to 202405, i.e. it works until https://github.com/void-linux/void-packages/commit/0cfc368caf5ad454dd076a866410ef774930cd1d included. arch=x86_64-glibc. I can test the new PR.

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322876386

Comment:
The new update (202408) also works for me.

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 412 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From cc74e944a8a5401ebf7b57c2544c4c9ba5af4c1f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH 1/3] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

From ca9496a7e0f0097a6fe8a52c907d83874533764c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:32:26 -0400
Subject: [PATCH 2/3] incus: move check from incus-user to incus

---
 srcpkgs/incus/files/{incus-user => incus}/check | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check

From 02b6d1820d110beba0addacc326e934344fad2ec Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:43:27 -0400
Subject: [PATCH 3/3] incus: expand readme for opt deps

---
 srcpkgs/incus/files/README.voidlinux | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..04181f786d898e 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,15 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+- To run VMs install `qemu` `edk2-ovmf` and add (replace x64 as needed)
+
+	export INCUS_EDK2_PATH=/usr/share/edk2/x64
+
+to incus service conf file.  The option `security.secureboot=false`
+is needed until incus or edk2-ovmf are patched to be compatible.
+
+- To run OCI install `spokeo` `umoci`.

Re: [PR REVIEW] incus: update to 6.4.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#discussion_r1739718945

Comment:
why can't we just do this in the run file always? does it fail if the path doesn't exist?

also, that path seems x86_64-specific 

Re: incus: update to 6.4.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322903314

Comment:
everything to patch for edk2 looks to be here, it's not a hard patch :

https://github.com/lxc/incus/blob/665db311c9b5d266ac231687e5de81a687492297/internal/server/instance/drivers/edk2/driver_edk2.go#L36

if we make sure the default filenames and paths match void's packaging, no need for the export or secureboot disablement instructions 

Re: incus: update to 6.4.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322903716

Comment:
or, better yet, this looks like fallback paths. maybe upstream would take a patch adding our filenames to those arrays

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322915748

Comment:
Yes, actually upstream suggested the same, I was just lazy, but let me do it.

Re: [PR REVIEW] incus: update to 6.4.0

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#discussion_r1739734674

Comment:
yes, it is (as noted)

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322929832

Comment:
I can now do without exporting variables, but secure boot does not yet work.. https://github.com/lxc/incus/pull/1170

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 412 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From cc74e944a8a5401ebf7b57c2544c4c9ba5af4c1f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH 1/4] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

From ca9496a7e0f0097a6fe8a52c907d83874533764c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:32:26 -0400
Subject: [PATCH 2/4] incus: move check from incus-user to incus

---
 srcpkgs/incus/files/{incus-user => incus}/check | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check

From a7ae4910276ad38e47b14c60669e6e3e592d7dd0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:43:27 -0400
Subject: [PATCH 3/4] incus: expand readme for opt deps

---
 srcpkgs/incus/files/README.voidlinux | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..1ab86f04b5e9f8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,10 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+- To run VMs install `qemu` `edk2-ovmf`.
+
+- To run OCI install `spokeo` `umoci`.

From 32c75e8a0039582fddbaeb16d328b81683db4c17 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 31 Aug 2024 10:43:36 -0400
Subject: [PATCH 4/4] incus: patch for edk2 paths

---
 ...nce-edk2-Add-Void-Linux-x86_64-paths.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch

diff --git a/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch b/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
new file mode 100644
index 00000000000000..1d84b84d69041b
--- /dev/null
+++ b/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
@@ -0,0 +1,35 @@
+From ca0d251dc9a5dfe0e040a5047dcbe006c260010a Mon Sep 17 00:00:00 2001
+From: dkwo <nicolopiazzalunga@gmail.com>
+Date: Sat, 31 Aug 2024 10:39:33 -0400
+Subject: [PATCH] incusd/isntance/edk2: Add Void Linux x86_64 paths
+
+---
+ internal/server/instance/drivers/edk2/driver_edk2.go | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
+index 094f1584c..574376f9a 100644
+--- a/internal/server/instance/drivers/edk2/driver_edk2.go
++++ b/internal/server/instance/drivers/edk2/driver_edk2.go
+@@ -80,6 +80,18 @@ var architectureInstallations = map[int][]Installation{
+ 				{Code: "seabios.bin", Vars: "seabios.bin"},
+ 			},
+ 		},
++	}, {
++		Path: "/usr/share/edk2/x64",
++		Usage: map[FirmwareUsage][]FirmwarePair{
++			GENERIC: {
++				{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
++				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
++			},
++			SECUREBOOT: {
++				{Code: "OVMF_CODE.secure.4m.fd", Vars: "OVMF_VARS.4m.fd"},
++				{Code: "OVMF_CODE.secure.fd", Vars: "OVMF_VARS.fd"},
++			},
++		},
+ 	}, {
+ 		Path: "/usr/share/OVMF/x64",
+ 		Usage: map[FirmwareUsage][]FirmwarePair{
+-- 
+2.46.0
+

Re: incus: update to 6.4.0

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2322974724

Comment:
Thanks for working on the patch, and for including my change to the check file. @dkwo 

Do we need to wait for upstream to merge before we update to 6.4? Given that  it's not a regression -VM support is already shakey is 6.3?

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 476 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

Todo: do not log to syslog?, some tools should be root-only.

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

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

From 788a492ad5c0c75f53550cf7fab38d88feaeee58 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH 1/7] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

From 1030e010cbd9e1b65ca12f47a39b1f40f511728d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:32:26 -0400
Subject: [PATCH 2/7] incus: move check from incus-user to incus

---
 srcpkgs/incus/files/{incus-user => incus}/check | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check

From 1b0c14a23cdc1e0140c69911a00f0142dc535d3c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:43:27 -0400
Subject: [PATCH 3/7] incus: expand readme for opt deps

---
 srcpkgs/incus/files/README.voidlinux | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..1ab86f04b5e9f8 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,10 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+- To run VMs install `qemu` `edk2-ovmf`.
+
+- To run OCI install `spokeo` `umoci`.

From 42394e4cace2b77acac29dd046a3fc232f65bf62 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 31 Aug 2024 10:43:36 -0400
Subject: [PATCH 4/7] incus: patch for edk2 paths

---
 ...nce-edk2-Add-Void-Linux-x86_64-paths.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch

diff --git a/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch b/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
new file mode 100644
index 00000000000000..1d84b84d69041b
--- /dev/null
+++ b/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
@@ -0,0 +1,35 @@
+From ca0d251dc9a5dfe0e040a5047dcbe006c260010a Mon Sep 17 00:00:00 2001
+From: dkwo <nicolopiazzalunga@gmail.com>
+Date: Sat, 31 Aug 2024 10:39:33 -0400
+Subject: [PATCH] incusd/isntance/edk2: Add Void Linux x86_64 paths
+
+---
+ internal/server/instance/drivers/edk2/driver_edk2.go | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
+index 094f1584c..574376f9a 100644
+--- a/internal/server/instance/drivers/edk2/driver_edk2.go
++++ b/internal/server/instance/drivers/edk2/driver_edk2.go
+@@ -80,6 +80,18 @@ var architectureInstallations = map[int][]Installation{
+ 				{Code: "seabios.bin", Vars: "seabios.bin"},
+ 			},
+ 		},
++	}, {
++		Path: "/usr/share/edk2/x64",
++		Usage: map[FirmwareUsage][]FirmwarePair{
++			GENERIC: {
++				{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
++				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
++			},
++			SECUREBOOT: {
++				{Code: "OVMF_CODE.secure.4m.fd", Vars: "OVMF_VARS.4m.fd"},
++				{Code: "OVMF_CODE.secure.fd", Vars: "OVMF_VARS.fd"},
++			},
++		},
+ 	}, {
+ 		Path: "/usr/share/OVMF/x64",
+ 		Usage: map[FirmwareUsage][]FirmwarePair{
+-- 
+2.46.0
+

From 6b353d338ff5dd74be3e1be0cef1bca225eda849 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 31 Aug 2024 13:16:23 -0400
Subject: [PATCH 5/7] incus: unupstreamable fixup

---
 srcpkgs/incus/patches/0002-expr.patch | 69 +++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 srcpkgs/incus/patches/0002-expr.patch

diff --git a/srcpkgs/incus/patches/0002-expr.patch b/srcpkgs/incus/patches/0002-expr.patch
new file mode 100644
index 00000000000000..58e3f0e4a87b76
--- /dev/null
+++ b/srcpkgs/incus/patches/0002-expr.patch
@@ -0,0 +1,69 @@
+From 6e60698688997cc95e1eb0b167f4d04403b6990d Mon Sep 17 00:00:00 2001
+From: dkwo <nicolopiazzalunga@gmail.com>
+Date: Sat, 31 Aug 2024 13:02:52 -0400
+Subject: [PATCH] incus: experiment with path
+
+---
+ .../instance/drivers/edk2/driver_edk2.go      | 46 -------------------
+ 1 file changed, 46 deletions(-)
+
+diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
+index 574376f9a..0715f0080 100644
+--- a/internal/server/instance/drivers/edk2/driver_edk2.go
++++ b/internal/server/instance/drivers/edk2/driver_edk2.go
+@@ -35,52 +35,6 @@ const (
+ 
+ var architectureInstallations = map[int][]Installation{
+ 	osarch.ARCH_64BIT_INTEL_X86: {{
+-		Path: "/usr/share/OVMF",
+-		Usage: map[FirmwareUsage][]FirmwarePair{
+-			GENERIC: {
+-				{Code: "OVMF_CODE.4MB.fd", Vars: "OVMF_VARS.4MB.fd"},
+-				{Code: "OVMF_CODE_4M.fd", Vars: "OVMF_VARS_4M.fd"},
+-				{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+-				{Code: "OVMF_CODE.2MB.fd", Vars: "OVMF_VARS.2MB.fd"},
+-				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
+-				{Code: "OVMF_CODE.fd", Vars: "qemu.nvram"},
+-			},
+-			SECUREBOOT: {
+-				{Code: "OVMF_CODE.4MB.fd", Vars: "OVMF_VARS.4MB.ms.fd"},
+-				{Code: "OVMF_CODE_4M.ms.fd", Vars: "OVMF_VARS_4M.ms.fd"},
+-				{Code: "OVMF_CODE_4M.secboot.fd", Vars: "OVMF_VARS_4M.secboot.fd"},
+-				{Code: "OVMF_CODE.secboot.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+-				{Code: "OVMF_CODE.secboot.fd", Vars: "OVMF_VARS.secboot.fd"},
+-				{Code: "OVMF_CODE.secboot.fd", Vars: "OVMF_VARS.fd"},
+-				{Code: "OVMF_CODE.2MB.fd", Vars: "OVMF_VARS.2MB.ms.fd"},
+-				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.ms.fd"},
+-				{Code: "OVMF_CODE.fd", Vars: "qemu.nvram"},
+-			},
+-			CSM: {
+-				{Code: "seabios.bin", Vars: "seabios.bin"},
+-				{Code: "OVMF_CODE.4MB.CSM.fd", Vars: "OVMF_VARS.4MB.CSM.fd"},
+-				{Code: "OVMF_CODE.csm.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+-				{Code: "OVMF_CODE.2MB.CSM.fd", Vars: "OVMF_VARS.2MB.CSM.fd"},
+-				{Code: "OVMF_CODE.CSM.fd", Vars: "OVMF_VARS.CSM.fd"},
+-				{Code: "OVMF_CODE.csm.fd", Vars: "OVMF_VARS.fd"},
+-			},
+-		},
+-	}, {
+-		Path: "/usr/share/qemu",
+-		Usage: map[FirmwareUsage][]FirmwarePair{
+-			GENERIC: {
+-				{Code: "ovmf-x86_64-4m-code.bin", Vars: "ovmf-x86_64-4m-vars.bin"},
+-				{Code: "ovmf-x86_64.bin", Vars: "ovmf-x86_64-code.bin"},
+-			},
+-			SECUREBOOT: {
+-				{Code: "ovmf-x86_64-ms-4m-vars.bin", Vars: "ovmf-x86_64-ms-4m-code.bin"},
+-				{Code: "ovmf-x86_64-ms-code.bin", Vars: "ovmf-x86_64-ms-vars.bin"},
+-			},
+-			CSM: {
+-				{Code: "seabios.bin", Vars: "seabios.bin"},
+-			},
+-		},
+-	}, {
+ 		Path: "/usr/share/edk2/x64",
+ 		Usage: map[FirmwareUsage][]FirmwarePair{
+ 			GENERIC: {
+-- 
+2.46.0
+

From 3e67329e9a0f792f446b995dda550bf0744d7b9c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 2 Sep 2024 10:11:40 -0400
Subject: [PATCH 6/7] incus: do not log to syslog

---
 srcpkgs/incus/files/incus/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/incus/files/incus/run b/srcpkgs/incus/files/incus/run
index d189b4395b90ff..a8f6bd3d95a41b 100644
--- a/srcpkgs/incus/files/incus/run
+++ b/srcpkgs/incus/files/incus/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 [ -r conf ] && . ./conf
-exec /usr/libexec/incus/incusd --group _incus-admin --syslog ${OPTS:- --verbose}
+exec /usr/libexec/incus/incusd --group _incus-admin ${OPTS:- --verbose}

From c1bb32cfe0fcd29c70e0425a37553f6e9609b0c1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 2 Sep 2024 10:17:08 -0400
Subject: [PATCH 7/7] incus-tools: keep certain tools root-only

---
 srcpkgs/incus/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 933f3dc186295a..01922cd63d3d26 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -46,13 +46,18 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+	# upstream recommends these should be kept to root only
+	for _tool in fuidshift-incus lxd-to-incus; do
+		chmod 700 ${DESTDIR}/usr/bin/${_tool}
+	done
 
 	# generate shell completions
-	local incus=${DESTDIR}/usr/bin/incus
-	for shell in bash fish zsh; do
-		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	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"

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2324905355

Comment:
it seems like the simple patch is not enough, as qemu is still using the first available path, unless i remove them by hand.
done a bunch of other small changes.

Re: [PR REVIEW] incus: update to 6.4.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#discussion_r1741095807

Comment:
```suggestion
To run virtual machines, install `qemu` and `edk2-ovmf`.
To run OCI containers, install `spokeo` and `umoci`.
```

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 412 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From 788a492ad5c0c75f53550cf7fab38d88feaeee58 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH 1/7] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

From 1030e010cbd9e1b65ca12f47a39b1f40f511728d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:32:26 -0400
Subject: [PATCH 2/7] incus: move check from incus-user to incus

---
 srcpkgs/incus/files/{incus-user => incus}/check | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check

From 1eb0be90ee20a01ce7e8b40033c5604249435966 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:43:27 -0400
Subject: [PATCH 3/7] incus: expand readme for opt deps

---
 srcpkgs/incus/files/README.voidlinux | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..2d1757447dda8e 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,9 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+To run virtual machines, install `qemu` and `edk2-ovmf`.
+To run OCI containers, install `spokeo` and `umoci`.

From e8b263b8d028247276843cd6880fef685a77d301 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 31 Aug 2024 10:43:36 -0400
Subject: [PATCH 4/7] incus: patch for edk2 paths

---
 ...nce-edk2-Add-Void-Linux-x86_64-paths.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch

diff --git a/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch b/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
new file mode 100644
index 00000000000000..1d84b84d69041b
--- /dev/null
+++ b/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
@@ -0,0 +1,35 @@
+From ca0d251dc9a5dfe0e040a5047dcbe006c260010a Mon Sep 17 00:00:00 2001
+From: dkwo <nicolopiazzalunga@gmail.com>
+Date: Sat, 31 Aug 2024 10:39:33 -0400
+Subject: [PATCH] incusd/isntance/edk2: Add Void Linux x86_64 paths
+
+---
+ internal/server/instance/drivers/edk2/driver_edk2.go | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
+index 094f1584c..574376f9a 100644
+--- a/internal/server/instance/drivers/edk2/driver_edk2.go
++++ b/internal/server/instance/drivers/edk2/driver_edk2.go
+@@ -80,6 +80,18 @@ var architectureInstallations = map[int][]Installation{
+ 				{Code: "seabios.bin", Vars: "seabios.bin"},
+ 			},
+ 		},
++	}, {
++		Path: "/usr/share/edk2/x64",
++		Usage: map[FirmwareUsage][]FirmwarePair{
++			GENERIC: {
++				{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
++				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
++			},
++			SECUREBOOT: {
++				{Code: "OVMF_CODE.secure.4m.fd", Vars: "OVMF_VARS.4m.fd"},
++				{Code: "OVMF_CODE.secure.fd", Vars: "OVMF_VARS.fd"},
++			},
++		},
+ 	}, {
+ 		Path: "/usr/share/OVMF/x64",
+ 		Usage: map[FirmwareUsage][]FirmwarePair{
+-- 
+2.46.0
+

From 662ca3e64aa170fe1d0dc620d4310b13e6a41c0d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 31 Aug 2024 13:16:23 -0400
Subject: [PATCH 5/7] incus: unupstreamable fixup

---
 srcpkgs/incus/patches/0002-expr.patch | 69 +++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 srcpkgs/incus/patches/0002-expr.patch

diff --git a/srcpkgs/incus/patches/0002-expr.patch b/srcpkgs/incus/patches/0002-expr.patch
new file mode 100644
index 00000000000000..58e3f0e4a87b76
--- /dev/null
+++ b/srcpkgs/incus/patches/0002-expr.patch
@@ -0,0 +1,69 @@
+From 6e60698688997cc95e1eb0b167f4d04403b6990d Mon Sep 17 00:00:00 2001
+From: dkwo <nicolopiazzalunga@gmail.com>
+Date: Sat, 31 Aug 2024 13:02:52 -0400
+Subject: [PATCH] incus: experiment with path
+
+---
+ .../instance/drivers/edk2/driver_edk2.go      | 46 -------------------
+ 1 file changed, 46 deletions(-)
+
+diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
+index 574376f9a..0715f0080 100644
+--- a/internal/server/instance/drivers/edk2/driver_edk2.go
++++ b/internal/server/instance/drivers/edk2/driver_edk2.go
+@@ -35,52 +35,6 @@ const (
+ 
+ var architectureInstallations = map[int][]Installation{
+ 	osarch.ARCH_64BIT_INTEL_X86: {{
+-		Path: "/usr/share/OVMF",
+-		Usage: map[FirmwareUsage][]FirmwarePair{
+-			GENERIC: {
+-				{Code: "OVMF_CODE.4MB.fd", Vars: "OVMF_VARS.4MB.fd"},
+-				{Code: "OVMF_CODE_4M.fd", Vars: "OVMF_VARS_4M.fd"},
+-				{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+-				{Code: "OVMF_CODE.2MB.fd", Vars: "OVMF_VARS.2MB.fd"},
+-				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
+-				{Code: "OVMF_CODE.fd", Vars: "qemu.nvram"},
+-			},
+-			SECUREBOOT: {
+-				{Code: "OVMF_CODE.4MB.fd", Vars: "OVMF_VARS.4MB.ms.fd"},
+-				{Code: "OVMF_CODE_4M.ms.fd", Vars: "OVMF_VARS_4M.ms.fd"},
+-				{Code: "OVMF_CODE_4M.secboot.fd", Vars: "OVMF_VARS_4M.secboot.fd"},
+-				{Code: "OVMF_CODE.secboot.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+-				{Code: "OVMF_CODE.secboot.fd", Vars: "OVMF_VARS.secboot.fd"},
+-				{Code: "OVMF_CODE.secboot.fd", Vars: "OVMF_VARS.fd"},
+-				{Code: "OVMF_CODE.2MB.fd", Vars: "OVMF_VARS.2MB.ms.fd"},
+-				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.ms.fd"},
+-				{Code: "OVMF_CODE.fd", Vars: "qemu.nvram"},
+-			},
+-			CSM: {
+-				{Code: "seabios.bin", Vars: "seabios.bin"},
+-				{Code: "OVMF_CODE.4MB.CSM.fd", Vars: "OVMF_VARS.4MB.CSM.fd"},
+-				{Code: "OVMF_CODE.csm.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+-				{Code: "OVMF_CODE.2MB.CSM.fd", Vars: "OVMF_VARS.2MB.CSM.fd"},
+-				{Code: "OVMF_CODE.CSM.fd", Vars: "OVMF_VARS.CSM.fd"},
+-				{Code: "OVMF_CODE.csm.fd", Vars: "OVMF_VARS.fd"},
+-			},
+-		},
+-	}, {
+-		Path: "/usr/share/qemu",
+-		Usage: map[FirmwareUsage][]FirmwarePair{
+-			GENERIC: {
+-				{Code: "ovmf-x86_64-4m-code.bin", Vars: "ovmf-x86_64-4m-vars.bin"},
+-				{Code: "ovmf-x86_64.bin", Vars: "ovmf-x86_64-code.bin"},
+-			},
+-			SECUREBOOT: {
+-				{Code: "ovmf-x86_64-ms-4m-vars.bin", Vars: "ovmf-x86_64-ms-4m-code.bin"},
+-				{Code: "ovmf-x86_64-ms-code.bin", Vars: "ovmf-x86_64-ms-vars.bin"},
+-			},
+-			CSM: {
+-				{Code: "seabios.bin", Vars: "seabios.bin"},
+-			},
+-		},
+-	}, {
+ 		Path: "/usr/share/edk2/x64",
+ 		Usage: map[FirmwareUsage][]FirmwarePair{
+ 			GENERIC: {
+-- 
+2.46.0
+

From 18d7d31211bde9488d48936653b7fc1c80674707 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 2 Sep 2024 10:11:40 -0400
Subject: [PATCH 6/7] incus: do not log to syslog

---
 srcpkgs/incus/files/incus/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/incus/files/incus/run b/srcpkgs/incus/files/incus/run
index d189b4395b90ff..a8f6bd3d95a41b 100644
--- a/srcpkgs/incus/files/incus/run
+++ b/srcpkgs/incus/files/incus/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 [ -r conf ] && . ./conf
-exec /usr/libexec/incus/incusd --group _incus-admin --syslog ${OPTS:- --verbose}
+exec /usr/libexec/incus/incusd --group _incus-admin ${OPTS:- --verbose}

From 1f4ea56b33997a8f024c7590e43e7a688c759693 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 2 Sep 2024 10:17:08 -0400
Subject: [PATCH 7/7] incus: keep certain tools root-only

---
 srcpkgs/incus/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 933f3dc186295a..01922cd63d3d26 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -46,13 +46,18 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+	# upstream recommends these should be kept to root only
+	for _tool in fuidshift-incus lxd-to-incus; do
+		chmod 700 ${DESTDIR}/usr/bin/${_tool}
+	done
 
 	# generate shell completions
-	local incus=${DESTDIR}/usr/bin/incus
-	for shell in bash fish zsh; do
-		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	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"

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2329586699

Comment:
One patch has been merged upstream. The other (removing all other paths not in Void) is still necessary, as qemu conf generator does not play well with fallback paths, see bug report https://github.com/lxc/incus/issues/1179
Can either merge as is for now, or wait for proper upstream fix.

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2331499168

Comment:
Other issue fixed as well.

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 412 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From 324c7fdbbd08fe12b8534cc899472a1b42dedad4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH 1/6] incus: update to 6.4.0

---
 srcpkgs/incus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..933f3dc186295a 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.4.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=c6ad8260a4954b0e4f77de66220d5450290b57858f8c16ee83f12996eea86db4
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root

From 4c9eefd19872f359f60bb4740943bfce940864cf Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:32:26 -0400
Subject: [PATCH 2/6] incus: move check from incus-user to incus

---
 srcpkgs/incus/files/{incus-user => incus}/check | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check

From 08585abe60bae3ccbf673872cac038729a1307d2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 30 Aug 2024 15:43:27 -0400
Subject: [PATCH 3/6] incus: expand readme for opt deps

---
 srcpkgs/incus/files/README.voidlinux | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..2d1757447dda8e 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,9 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+To run virtual machines, install `qemu` and `edk2-ovmf`.
+To run OCI containers, install `spokeo` and `umoci`.

From 43bf238371ac7772c1e841830c4fd416325e490e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 2 Sep 2024 10:11:40 -0400
Subject: [PATCH 4/6] incus: do not log to syslog

---
 srcpkgs/incus/files/incus/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/incus/files/incus/run b/srcpkgs/incus/files/incus/run
index d189b4395b90ff..a8f6bd3d95a41b 100644
--- a/srcpkgs/incus/files/incus/run
+++ b/srcpkgs/incus/files/incus/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 [ -r conf ] && . ./conf
-exec /usr/libexec/incus/incusd --group _incus-admin --syslog ${OPTS:- --verbose}
+exec /usr/libexec/incus/incusd --group _incus-admin ${OPTS:- --verbose}

From ba23d5d573e2331b630ea6d960b002f08a0f783f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 2 Sep 2024 10:17:08 -0400
Subject: [PATCH 5/6] incus: keep certain tools root-only

---
 srcpkgs/incus/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 933f3dc186295a..01922cd63d3d26 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -46,13 +46,18 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+	# upstream recommends these should be kept to root only
+	for _tool in fuidshift-incus lxd-to-incus; do
+		chmod 700 ${DESTDIR}/usr/bin/${_tool}
+	done
 
 	# generate shell completions
-	local incus=${DESTDIR}/usr/bin/incus
-	for shell in bash fish zsh; do
-		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	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"

From 64dcc01ae93b4d4207bfeae429ee237a983f8edb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 31 Aug 2024 10:43:36 -0400
Subject: [PATCH 6/6] incus: patch for edk2 paths

---
 ...nce-edk2-Add-Void-Linux-x86_64-paths.patch | 35 ++++++++++++++
 ...28fa146569b78a36320a4c808da0782e038f.patch | 46 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
 create mode 100644 srcpkgs/incus/patches/20e228fa146569b78a36320a4c808da0782e038f.patch

diff --git a/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch b/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
new file mode 100644
index 00000000000000..1d84b84d69041b
--- /dev/null
+++ b/srcpkgs/incus/patches/0001-incusd-isntance-edk2-Add-Void-Linux-x86_64-paths.patch
@@ -0,0 +1,35 @@
+From ca0d251dc9a5dfe0e040a5047dcbe006c260010a Mon Sep 17 00:00:00 2001
+From: dkwo <nicolopiazzalunga@gmail.com>
+Date: Sat, 31 Aug 2024 10:39:33 -0400
+Subject: [PATCH] incusd/isntance/edk2: Add Void Linux x86_64 paths
+
+---
+ internal/server/instance/drivers/edk2/driver_edk2.go | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
+index 094f1584c..574376f9a 100644
+--- a/internal/server/instance/drivers/edk2/driver_edk2.go
++++ b/internal/server/instance/drivers/edk2/driver_edk2.go
+@@ -80,6 +80,18 @@ var architectureInstallations = map[int][]Installation{
+ 				{Code: "seabios.bin", Vars: "seabios.bin"},
+ 			},
+ 		},
++	}, {
++		Path: "/usr/share/edk2/x64",
++		Usage: map[FirmwareUsage][]FirmwarePair{
++			GENERIC: {
++				{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
++				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
++			},
++			SECUREBOOT: {
++				{Code: "OVMF_CODE.secure.4m.fd", Vars: "OVMF_VARS.4m.fd"},
++				{Code: "OVMF_CODE.secure.fd", Vars: "OVMF_VARS.fd"},
++			},
++		},
+ 	}, {
+ 		Path: "/usr/share/OVMF/x64",
+ 		Usage: map[FirmwareUsage][]FirmwarePair{
+-- 
+2.46.0
+
diff --git a/srcpkgs/incus/patches/20e228fa146569b78a36320a4c808da0782e038f.patch b/srcpkgs/incus/patches/20e228fa146569b78a36320a4c808da0782e038f.patch
new file mode 100644
index 00000000000000..3eaf9cbee599e7
--- /dev/null
+++ b/srcpkgs/incus/patches/20e228fa146569b78a36320a4c808da0782e038f.patch
@@ -0,0 +1,46 @@
+From 20e228fa146569b78a36320a4c808da0782e038f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
+Date: Thu, 5 Sep 2024 00:07:46 -0400
+Subject: [PATCH] incusd/instance/drivers/edk2: Actually check that the files
+ exist
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #1179
+
+Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
+---
+ internal/server/instance/drivers/edk2/driver_edk2.go | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
+index 49321d3ccd..ce9cd47677 100644
+--- a/internal/server/instance/drivers/edk2/driver_edk2.go
++++ b/internal/server/instance/drivers/edk2/driver_edk2.go
+@@ -5,6 +5,7 @@ import (
+ 	"path/filepath"
+ 
+ 	"github.com/lxc/incus/v6/shared/osarch"
++	"github.com/lxc/incus/v6/shared/util"
+ )
+ 
+ // FirmwarePair represents a combination of firmware code (Code) and storage (Vars).
+@@ -177,9 +178,15 @@ func GetArchitectureFirmwarePairsForUsage(hostArch int, usage FirmwareUsage) []F
+ 					searchPath = installation.Path
+ 				}
+ 
++				codePath := filepath.Join(searchPath, firmwarePair.Code)
++				varsPath := filepath.Join(searchPath, firmwarePair.Vars)
++				if !util.PathExists(codePath) || !util.PathExists(varsPath) {
++					continue
++				}
++
+ 				firmwares = append(firmwares, FirmwarePair{
+-					Code: filepath.Join(searchPath, firmwarePair.Code),
+-					Vars: filepath.Join(searchPath, firmwarePair.Vars),
++					Code: codePath,
++					Vars: varsPath,
+ 				})
+ 			}
+ 		}

Re: incus: update to 6.4.0

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2331507903

Comment:
I believe this is now working properly. All patches are upstream. Probably v6.5 is also coming soon..

Re: [PR PATCH] [Updated] incus: update to 6.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 412 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/51907

incus: update to 6.4.0
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From 4fcc0834f75d642138ecedd37062817d87c850a3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH] incus: update to 6.5, various improvements

	- move check from incus-user to incus
	- expand readme for opt deps
	- do not log to syslog
	- keep certain tools root-only
---
 srcpkgs/incus/files/README.voidlinux            |  6 ++++++
 srcpkgs/incus/files/{incus-user => incus}/check |  0
 srcpkgs/incus/files/incus/run                   |  2 +-
 srcpkgs/incus/template                          | 17 +++++++++++------
 4 files changed, 18 insertions(+), 7 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..2d1757447dda8e 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,9 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+To run virtual machines, install `qemu` and `edk2-ovmf`.
+To run OCI containers, install `spokeo` and `umoci`.
diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check
diff --git a/srcpkgs/incus/files/incus/run b/srcpkgs/incus/files/incus/run
index d189b4395b90ff..a8f6bd3d95a41b 100644
--- a/srcpkgs/incus/files/incus/run
+++ b/srcpkgs/incus/files/incus/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 [ -r conf ] && . ./conf
-exec /usr/libexec/incus/incusd --group _incus-admin --syslog ${OPTS:- --verbose}
+exec /usr/libexec/incus/incusd --group _incus-admin ${OPTS:- --verbose}
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..15b743dd1069c8 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.5.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -21,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=aabc762bdcfe210b777e6b78e40150c9ffbc798aa39c8b4ba55812dac3ada0ec
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -46,13 +46,18 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+	# upstream recommends these should be kept to root only
+	for _tool in fuidshift-incus lxd-to-incus; do
+		chmod 700 ${DESTDIR}/usr/bin/${_tool}
+	done
 
 	# generate shell completions
-	local incus=${DESTDIR}/usr/bin/incus
-	for shell in bash fish zsh; do
-		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	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"

Re: incus: update to 6.5

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#issuecomment-2334048462

Comment:
v6.5 out and tested.

Re: [PR REVIEW] incus: update to 6.5

[rekh127]

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

New review comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#discussion_r1747758163

Comment:
What is this change about?

Re: [PR REVIEW] incus: update to 6.5

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#discussion_r1747760704

Comment:
services shouldn't log directly to syslog, but to stdout, where runit will collect the logs

Re: [PR REVIEW] incus: update to 6.5

[rekh127]

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

New review comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/51907#discussion_r1747761994

Comment:
thanks for explaining

Re: [PR PATCH] [Updated] incus: update to 6.5

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 410 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/51907

incus: update to 6.5
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From e20ddd34294ab582cac0d091c17768ea1589d03d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH] incus: update to 6.5, various improvements

	- move check from incus-user to incus
	- expand readme for opt deps
	- do not log to syslog
	- keep certain tools root-only
	- add simplestreams tool
---
 srcpkgs/incus/files/README.voidlinux          |  6 +++++
 .../incus/files/{incus-user => incus}/check   |  0
 srcpkgs/incus/files/incus/run                 |  2 +-
 srcpkgs/incus/template                        | 23 ++++++++++++-------
 4 files changed, 22 insertions(+), 9 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..2d1757447dda8e 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,9 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+To run virtual machines, install `qemu` and `edk2-ovmf`.
+To run OCI containers, install `spokeo` and `umoci`.
diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check
diff --git a/srcpkgs/incus/files/incus/run b/srcpkgs/incus/files/incus/run
index d189b4395b90ff..a8f6bd3d95a41b 100644
--- a/srcpkgs/incus/files/incus/run
+++ b/srcpkgs/incus/files/incus/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 [ -r conf ] && . ./conf
-exec /usr/libexec/incus/incusd --group _incus-admin --syslog ${OPTS:- --verbose}
+exec /usr/libexec/incus/incusd --group _incus-admin ${OPTS:- --verbose}
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..c2af156ab3330e 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.5.0
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6
@@ -11,7 +11,8 @@ go_package="${go_import_path}/cmd/incus
  ${go_import_path}/cmd/incus-user
  ${go_import_path}/cmd/incusd
  ${go_import_path}/cmd/lxc-to-incus
- ${go_import_path}/cmd/fuidshift"
+ ${go_import_path}/cmd/fuidshift
+ ${go_import_path}/cmd/incus-simplestreams"
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
@@ -21,7 +22,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=aabc762bdcfe210b777e6b78e40150c9ffbc798aa39c8b4ba55812dac3ada0ec
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -46,13 +47,18 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+	# upstream recommends these should be kept to root only
+	for _tool in fuidshift-incus lxd-to-incus; do
+		chmod 700 ${DESTDIR}/usr/bin/${_tool}
+	done
 
 	# generate shell completions
-	local incus=${DESTDIR}/usr/bin/incus
-	for shell in bash fish zsh; do
-		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	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"
@@ -73,7 +79,8 @@ incus-client_package() {
 incus-tools_package() {
 	short_desc+=" - tools"
 	pkg_install() {
-		for _tool in fuidshift-incus lxc-to-incus lxd-to-incus incus-benchmark incus-migrate; do
+		for _tool in fuidshift-incus lxc-to-incus lxd-to-incus \
+		incus-benchmark incus-migrate incus-simplestreams; do
 			vmove usr/bin/${_tool}
 		done
 	}

Re: [PR PATCH] [Updated] incus: update to 6.5

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 410 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/51907

incus: update to 6.5
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From 4e9859de802ed3c4ae25fcbd8bf93fabcc26f562 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 19 Aug 2024 08:23:58 +0200
Subject: [PATCH] incus: update to 6.5, various improvements

	- move check from incus-user to incus
	- expand readme for opt deps
	- do not log to syslog
	- keep certain tools root-only
	- add simplestreams tool
	- build all cmds
---
 srcpkgs/incus/files/README.voidlinux          |  6 +++++
 .../incus/files/{incus-user => incus}/check   |  0
 srcpkgs/incus/files/incus/run                 |  2 +-
 srcpkgs/incus/template                        | 27 ++++++++++---------
 4 files changed, 21 insertions(+), 14 deletions(-)
 rename srcpkgs/incus/files/{incus-user => incus}/check (100%)

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..2d1757447dda8e 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,9 @@ containers. For example, the command
 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`.
+
+
+Optional dependencies:
+
+To run virtual machines, install `qemu` and `edk2-ovmf`.
+To run OCI containers, install `spokeo` and `umoci`.
diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus/check
similarity index 100%
rename from srcpkgs/incus/files/incus-user/check
rename to srcpkgs/incus/files/incus/check
diff --git a/srcpkgs/incus/files/incus/run b/srcpkgs/incus/files/incus/run
index d189b4395b90ff..a8f6bd3d95a41b 100644
--- a/srcpkgs/incus/files/incus/run
+++ b/srcpkgs/incus/files/incus/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 [ -r conf ] && . ./conf
-exec /usr/libexec/incus/incusd --group _incus-admin --syslog ${OPTS:- --verbose}
+exec /usr/libexec/incus/incusd --group _incus-admin ${OPTS:- --verbose}
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 7a106e4d338246..f3ea185bad0b59 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,17 +1,12 @@
 # Template file for 'incus'
 pkgname=incus
-version=6.3.0
-revision=5
+version=6.5.0
+revision=1
 build_style=go
 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
- ${go_import_path}/cmd/incus-user
- ${go_import_path}/cmd/incusd
- ${go_import_path}/cmd/lxc-to-incus
- ${go_import_path}/cmd/fuidshift"
+go_package="${go_import_path}/cmd/..."
 hostmakedepends="pkg-config"
 makedepends="lxc-devel acl-devel cowsql-devel raft-devel
  libcap-devel libuv-devel sqlite-devel eudev-libudev-devel"
@@ -21,7 +16,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=7dfb4c17334480af18f2827538b58bedc54e885eab54d224364b973df3183f91
+checksum=aabc762bdcfe210b777e6b78e40150c9ffbc798aa39c8b4ba55812dac3ada0ec
 system_groups="_incus-admin _incus"
 make_dirs="
  /var/lib/incus 0755 root root
@@ -46,13 +41,18 @@ post_install() {
 		vinstall "${f}" 700 usr/libexec/incus && rm "${f}"
 	done
 	vsv incus
+
 	# avoid conflict with lxd, lxd-lts
 	mv ${DESTDIR}/usr/bin/{fuidshift,fuidshift-incus}
+	# upstream recommends these should be kept to root only
+	for _tool in fuidshift-incus lxd-to-incus; do
+		chmod 700 ${DESTDIR}/usr/bin/${_tool}
+	done
 
 	# generate shell completions
-	local incus=${DESTDIR}/usr/bin/incus
-	for shell in bash fish zsh; do
-		vtargetrun ${incus} completion ${shell} > scripts/${shell}-completion
+	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"
@@ -73,7 +73,8 @@ incus-client_package() {
 incus-tools_package() {
 	short_desc+=" - tools"
 	pkg_install() {
-		for _tool in fuidshift-incus lxc-to-incus lxd-to-incus incus-benchmark incus-migrate; do
+		for _tool in fuidshift-incus lxc-to-incus lxd-to-incus \
+		incus-benchmark incus-migrate incus-simplestreams; do
 			vmove usr/bin/${_tool}
 		done
 	}

Re: [PR PATCH] [Merged]: incus: update to 6.5

[classabbyamp]

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

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

incus: update to 6.5
https://github.com/void-linux/void-packages/pull/51907

Description:
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-glibc)