[PR PATCH] Minor updates to incus service files

[PR PATCH] Minor updates to incus service files

[rekh127]

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

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

https://github.com/rekh127/void-packages incus-doc
https://github.com/void-linux/void-packages/pull/52042

Minor updates to incus service files
Moving the check file to the service it actually tests, and adding opt deps for OCI containers and VM to readme and conf file.  

Based on [dkwo's version bump](https://github.com/void-linux/void-packages/pull/51907) 
I'll update to be based on master when that lands.  Will probably need some adjustments when we figure out the VM freeze thing, but wanted to open the PR for comment now.

#### Testing the changes
- I tested the changes in this PR: **YES**
Locally with test instances, and running it now on my server. 



#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-incus-doc-52042.patch --]
[-- Type: text/x-diff, Size: 3919 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 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 8109eebf7ea0a1166dee4d81a0e22a285a9adbb6 Mon Sep 17 00:00:00 2001
From: Moss Butler <1187110+rekh127@users.noreply.github.com>
Date: Thu, 29 Aug 2024 15:20:41 -0700
Subject: [PATCH 2/3] incus/check: running as root checks if incus is up not
 incus-user

---
 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 54e1e03fc58d6dd27bdae7c333454495fb40a937 Mon Sep 17 00:00:00 2001
From: Moss Butler <1187110+rekh127@users.noreply.github.com>
Date: Thu, 29 Aug 2024 15:20:44 -0700
Subject: [PATCH 3/3] incus/README.voidlinux document optional dependencies

---
 srcpkgs/incus/files/README.voidlinux | 11 +++++++++++
 srcpkgs/incus/files/incus/conf       | 11 +++++++++++
 srcpkgs/incus/template               |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/incus/files/incus/conf

diff --git a/srcpkgs/incus/files/README.voidlinux b/srcpkgs/incus/files/README.voidlinux
index 3a4a5b356f49a9..4a04670a09c51d 100644
--- a/srcpkgs/incus/files/README.voidlinux
+++ b/srcpkgs/incus/files/README.voidlinux
@@ -9,3 +9,14 @@ 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`.
+
+In order to use incus to run VM's install packages `qemu` and
+`edk2-ovmf` and uncomment the INCUS_EDK2_PATH variable
+in `/etc/sv/incus/conf`. Then set `security.secureboot`
+to false in incus config or symlink the secure boot files
+in `/usr/share/edk2/x64`
+`ln -s OVMF_CODE.secure.fd OVMF_CODE.secboot.fd`
+`ln -s OVMF_CODE.secure.4m.fd OVMF_CODE.secboot.4m.fd`
+
+In order to use incus to run OCI containers install packages
+`skopeo` and `umoci`
diff --git a/srcpkgs/incus/files/incus/conf b/srcpkgs/incus/files/incus/conf
new file mode 100644
index 00000000000000..562c89f7c711ba
--- /dev/null
+++ b/srcpkgs/incus/files/incus/conf
@@ -0,0 +1,11 @@
+# Configuration for incus server
+
+# Location of EDK2 firmware needed to run VM
+# instances
+#export INCUS_EDK2_PATH=/usr/share/edk2/x64/
+
+# If you install a web ui for Incus add the path
+# to the directory containing the fils
+#export INCUS_UI=/opt/incus/ui/
+
+
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index 933f3dc186295a..3d161e3bd26157 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.4.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6

Re: [PR PATCH] [Closed]: Minor updates to incus service files

[rekh127]

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

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

Minor updates to incus service files
https://github.com/void-linux/void-packages/pull/52042

Description:
Moving the check file to the service it actually tests, and adding opt deps for OCI containers and VM to readme and conf file.  

Based on [dkwo's version bump](https://github.com/void-linux/void-packages/pull/51907) 
I'll update to be based on master when that lands.  Will probably need some adjustments when we figure out the VM freeze thing, but wanted to open the PR for comment now.

#### Testing the changes
- I tested the changes in this PR: **YES**
Locally with test instances, and running it now on my server. 



#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64

Re: Minor updates to incus service files

[rekh127]

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

New comment by rekh127 on void-packages repository

https://github.com/void-linux/void-packages/pull/52042#issuecomment-2322975122

Comment:
Changes included in https://github.com/void-linux/void-packages/pull/51907, closing