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

[dkwo <dkwo@users.noreply.github.com>]

[-- 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"