[gentoo-commits] repo/gentoo:master commit in: app-containers/incus/files/, app-containers/incus/
commit: 32ac32f5bf34d23b6b9316529ebf7607f233588e
Author: Joonas Niilola gentoo org>
AuthorDate: Mon Feb 26 08:50:15 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Feb 26 08:50:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ac32f5
app-containers/incus: drop 0.5, 0.5.1, 0.5.1-r1, 0.6
Signed-off-by: Joonas Niilola gentoo.org>
app-containers/incus/Manifest | 4 -
...ncus-0.5.1-handle-legacy-lxd-agent-loader.patch | 30 ---
app-containers/incus/incus-0.5.1-r1.ebuild | 208 -
app-containers/incus/incus-0.5.1.ebuild| 206
app-containers/incus/incus-0.5.ebuild | 206
app-containers/incus/incus-0.6.ebuild | 206
6 files changed, 860 deletions(-)
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index 55b97b64ed3a..317004b4edc8 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -1,6 +1,2 @@
-DIST incus-0.5.1.tar.xz 11101024 BLAKE2B
501d32009558688b153b3b0fae8216186390c44b30b9eb9de725ce129b5776406d8d4d7c686250cdf372bd386a1df491d78c533d9a7befefa987af1eec6420ee
SHA512
b2daff7086cda43f8ad36775d3f6434baed7f8276cb630f3d6a6b7270e4a95e053cb00caaf3f9a79d9fd7594fe641571d076db7d15405a63117d1be63510ae91
-DIST incus-0.5.1.tar.xz.asc 833 BLAKE2B
c1a5a26cdfc400ba100bc300d567365641d1001c3e121aed5d2f19bed4cf985f3ac1680ff7d1691642bf8cf3dd7a2a783d5cfc9f0bab0ac8525f88f791223227
SHA512
ea4599f06897375c340549c3e6dc137ce8dce4c0f325ff970954af9a4587640158674d154db5f61103acaa3134e7ea4907a0e608ad2fa085776a3f74520deef2
-DIST incus-0.5.tar.xz 11094876 BLAKE2B
a05966112cabd6c03395f360f73f29abf7852c37df8e6fb2886b5cff0581f8948fba2f8598a49e9cdb079adcf360dbebf66a6f32c10c224e816e39a46236a5c7
SHA512
7d13bde3b7a09ababe1b67bab6f8b5e4fcbff4d2dcdf677454cc34733636829da4c3c840b634bdee893fd4550f575a94e4b618bd665a460223c26fd24cda87c6
-DIST incus-0.5.tar.xz.asc 833 BLAKE2B
20dcb99abcbda69a9e1476f16a3a35ea9f326e42ebb95211886570217e7f54dc08ef122fd6315fdcd546aa7fe9aa35af837ba705bafae7c74fb45591a1642bda
SHA512
10ba6569e94347e1936aaae94b9823ce81ace1c7590b56e69f2f321ea55ad45ad0f753c3358d47bf7a0bea9ae013c1206eb6cbed53b55c20381c29f20f2be6fa
DIST incus-0.6.tar.xz 11749212 BLAKE2B
6cf607f13f0dd14e04b49e97e718d6f11612193a6f27515988c9d12383e3655147edd1120a2b030c9b77f3f72c0c73ae3ec960090b4d76f59930ac0256c2a5c8
SHA512
c90251be777963c437c8f5a3f6a9e448d41f58ec2f2fb7bafbdc241f32234edd50a82a4c6d4a19e822a3d090282e8ea220842a27b17d17bce8691c1549209f7f
DIST incus-0.6.tar.xz.asc 833 BLAKE2B
47d80cbf92961d03e8a96eb313213960b02730d21d0a36c37e22bd1ea238bee72b94f2f98f49574b4ae07d847099db760a253f3bf69ff2658bcba65bc6a61315
SHA512
7504f74bf1659f06c40b9ae04853bb993988ae704f2b46c39a744bfa7b179383b5377851b6514b368826d6b3beb930188f3cf73b51c99a1b4cb90f8f03a60b5c
diff --git
a/app-containers/incus/files/incus-0.5.1-handle-legacy-lxd-agent-loader.patch
b/app-containers/incus/files/incus-0.5.1-handle-legacy-lxd-agent-loader.patch
deleted file mode 100644
index 472cf57cf273..
---
a/app-containers/incus/files/incus-0.5.1-handle-legacy-lxd-agent-loader.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aebcd59a3400f255aa9da97d271ec4c2b9ba4eb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?=
-Date: Tue, 30 Jan 2024 11:32:45 -0500
-Subject: [PATCH] incusd/instance/qemu/agent-loader: Handle legacy
- lxd-agent-loader
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Stéphane Graber
- internal/server/instance/drivers/agent-loader/incus-agent | 6 ++
- 1 file changed, 6 insertions(+)
-
-diff --git a/internal/server/instance/drivers/agent-loader/incus-agent
b/internal/server/instance/drivers/agent-loader/incus-agent
-index 6ed5ece1ac..b0ebc25b68 100644
a/internal/server/instance/drivers/agent-loader/incus-agent
-+++ b/internal/server/instance/drivers/agent-loader/incus-agent
-@@ -1,5 +1,11 @@
- #!/bin/sh
- PREFIX="/run/incus_agent"
-+
-+# Legacy handling
-+if [ ! -e "${PREFIX}" ] && [ -d "/run/lxd_agent" ]; then
-+ln -s "/run/lxd_agent" "${PREFIX}"
-+fi
-+
- mkdir -p "${PREFIX}/.mnt"
-
- # Functions.
diff --git a/app-containers/incus/incus-0.5.1-r1.ebuild
b/app-containers/incus/incus-0.5.1-r1.ebuild
deleted file mode 100644
index c0a209c1da76..
--- a/app-containers/incus/incus-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine
manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/
https://github.com/lxc/incus;
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
- verify-sig? (
[gentoo-commits] repo/gentoo:master commit in: app-containers/incus/files/, app-containers/incus/
commit: f5dc8f452e48b073b51ee4c091e863df3d18e127
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Feb 24 09:10:51 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Feb 24 09:11:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5dc8f45
app-containers/incus: add upstream patch to 0.6 for column handling
Signed-off-by: Joonas Niilola gentoo.org>
...0.6-fix-column-handling-with-all-projects.patch | 41
app-containers/incus/incus-0.6-r1.ebuild | 208 +
2 files changed, 249 insertions(+)
diff --git
a/app-containers/incus/files/incus-0.6-fix-column-handling-with-all-projects.patch
b/app-containers/incus/files/incus-0.6-fix-column-handling-with-all-projects.patch
new file mode 100644
index ..75e85331f776
--- /dev/null
+++
b/app-containers/incus/files/incus-0.6-fix-column-handling-with-all-projects.patch
@@ -0,0 +1,41 @@
+From bbc4b946355775606da35557e5404ca83a586c67 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?=
+Date: Thu, 22 Feb 2024 22:41:15 -0500
+Subject: [PATCH] incus/image: Fix column handling with --all-projects
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Stéphane Graber
+---
+ cmd/incus/image.go | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmd/incus/image.go b/cmd/incus/image.go
+index 5ee2b74709..d5a1126855 100644
+--- a/cmd/incus/image.go
b/cmd/incus/image.go
+@@ -1134,11 +1134,6 @@ func (c *cmdImageList) parseColumns() ([]imageColumn,
error) {
+ columnList := strings.Split(c.flagColumns, ",")
+
+ columns := []imageColumn{}
+- // Add project column if --all-projects flag specified and
+- // no --c was passed
+- if c.flagAllProjects && c.flagColumns == defaultImagesColumns {
+- c.flagColumns = defaultImagesColumnsAllProjects
+- }
+
+ for _, columnEntry := range columnList {
+ if columnEntry == "" {
+@@ -1321,6 +1316,11 @@ func (c *cmdImageList) Run(cmd *cobra.Command, args
[]string) error {
+ return err
+ }
+
++ // Add project column if --all-projects flag specified and no -c was
passed.
++ if c.flagAllProjects && c.flagColumns == defaultImagesColumns {
++ c.flagColumns = defaultImagesColumnsAllProjects
++ }
++
+ // Parse remote
+ remote := ""
+ if len(args) > 0 {
diff --git a/app-containers/incus/incus-0.6-r1.ebuild
b/app-containers/incus/incus-0.6-r1.ebuild
new file mode 100644
index ..ccbc40adf773
--- /dev/null
+++ b/app-containers/incus/incus-0.6-r1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine
manager"
+HOMEPAGE="https://linuxcontainers.org/incus/introduction/
https://github.com/lxc/incus;
+SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
+ verify-sig? (
https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="apparmor fuidshift nls"
+
+DEPEND="acct-group/incus
+ acct-group/incus-admin
+ app-arch/xz-utils
+ >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+ dev-db/sqlite:3
+ dev-libs/cowsql
+ dev-libs/lzo
+ >=dev-libs/raft-0.22.0:=[lz4]
+ >=dev-util/xdelta-3.0[lzma(+)]
+ net-dns/dnsmasq[dhcp]
+ sys-libs/libcap
+ virtual/udev"
+RDEPEND="${DEPEND}
+ fuidshift? ( !app-containers/lxd )
+ net-firewall/ebtables
+ net-firewall/iptables
+ sys-apps/iproute2
+ sys-fs/fuse:*
+ >=sys-fs/lxcfs-5.0.0
+ sys-fs/squashfs-tools[lzma]
+ virtual/acl"
+BDEPEND=">=dev-lang/go-1.21
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+ ~CGROUPS
+ ~IPC_NS
+ ~NET_NS
+ ~PID_NS
+
+ ~SECCOMP
+ ~USER_NS
+ ~UTS_NS
+
+ ~KVM
+ ~MACVTAP
+ ~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual
machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/incus
+ /usr/bin/lxc-to-incus
+ /usr/bin/incus-agent
+ /usr/bin/incus-benchmark
+ /usr/bin/incus-migrate
+ /usr/sbin/fuidshift
+ /usr/sbin/lxd-to-incus
+
[gentoo-commits] repo/gentoo:master commit in: app-containers/incus/files/, app-containers/incus/
commit: a1352d545ad07c3b23775bb7e73b5d90da0e598d
Author: Joonas Niilola gentoo org>
AuthorDate: Fri Dec 8 06:46:46 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Dec 8 06:46:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1352d54
app-containers/incus: drop 0.2-r1
Signed-off-by: Joonas Niilola gentoo.org>
app-containers/incus/Manifest | 2 -
.../incus-0.2-lxd-to-incus-openrc-support.patch| 71
app-containers/incus/incus-0.2-r1.ebuild | 191 -
3 files changed, 264 deletions(-)
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index 2ca38764f6e5..25ce019f4241 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -1,4 +1,2 @@
-DIST incus-0.2.tar.xz 13248036 BLAKE2B
1b83fc3498d5c31984053e000b9d63846aa6a9087158720eb5a25a8c3bd8cd0ab97391334622612b62d9c8aef145f45668f31abfa25e993b959d1609b0af1694
SHA512
0f2656e41faf9e020392f39a012a6ab64a6683894b2e463fac6bf6a2c2bb55280d454e5b4c23ab23526517a0b2b3c66c7b9a6d5f9477ca0848347a8534ea5eec
-DIST incus-0.2.tar.xz.asc 833 BLAKE2B
834f9adaea11a85e0a03c75edaadfd226b3be57c49015c2ba7b4fe021b9e8b2e403b5f11e6a482dd1f024456ef4e0bf3145ce15c9f5b0a26954410a2fdac6f9f
SHA512
ab55dbbc450b24429e77d816eddee541ebc8453a71704d1ec003a7b0d12a192faab438f6cfe82e90889d845dfaf9a5e9ea2b8d596198e19adbffb106a326000c
DIST incus-0.3.tar.xz 13344380 BLAKE2B
8160843df4ff419ef8890fcdd6b6b7e2c3cdec509ae072ec195c2b2c44e61ab3dc20a0488e9023d891b7ee2f2c700cfb8206ebe29236c29705a7121e5436d64f
SHA512
d3f3141f72a8ecf007faca8c2f2d1465d766d12f763e714d296fd28acd7e3095dd49834d428f42bf142e301cf1af7ee00ef74005d128c49aa147fb4d9348dbde
DIST incus-0.3.tar.xz.asc 833 BLAKE2B
532ee90f3ed1d4798a19dcc9df8fe6587ab5ab93d18accae7aae8e44cb8c8086c77702a572a371a966eee4ebed84a2d7941f52001152a1894e1d74aa235a06e0
SHA512
afd2aab52a19b618d194eab71974f84d1d3eb9639b2672d8e94153ac23b05764667374504b5f1355238341c4194de282d3bc7635335375fd347ba513eb66e685
diff --git
a/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch
b/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch
deleted file mode 100644
index 9ab26752f9f8..
--- a/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 73f22c10770ba07ffe55e37480c5d50beb3c0c35 Mon Sep 17 00:00:00 2001
-From: xsoalokinx
-Date: Sun, 29 Oct 2023 07:42:02 +
-Subject: [PATCH] cmd/lxd-to-incus: Add OpenRC target support
-
-Signed-off-by: xsoalokinx
- cmd/lxd-to-incus/targets.go | 46 -
- 1 file changed, 45 insertions(+), 1 deletion(-)
-
-diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go
-index ed84d3ebc..0940e1597 100644
a/cmd/lxd-to-incus/targets.go
-+++ b/cmd/lxd-to-incus/targets.go
-@@ -16,7 +16,7 @@ type Target interface {
- Paths() (*DaemonPaths, error)
- }
-
--var targets = []Target{{}}
-+var targets = []Target{{}, {}}
-
- type targetSystemd struct{}
-
-@@ -61,3 +61,47 @@ func (s *targetSystemd) Paths() (*DaemonPaths, error) {
- Cache: "/var/cache/incus/",
- }, nil
- }
-+
-+type targetOpenRC struct{}
-+
-+func (s *targetOpenRC) Present() bool {
-+if !util.PathExists("/var/lib/incus/") {
-+return false
-+}
-+
-+_, err := subprocess.RunCommand("rc-service", "--exists", "incus")
-+if err != nil {
-+return false
-+}
-+
-+return true
-+}
-+
-+func (s *targetOpenRC) Stop() error {
-+_, err := subprocess.RunCommand("rc-service", "incus", "stop")
-+return err
-+}
-+
-+func (s *targetOpenRC) Start() error {
-+_, err := subprocess.RunCommand("rc-service", "incus", "start")
-+if err != nil {
-+return err
-+}
-+
-+// Wait for the socket to become available.
-+time.Sleep(5 * time.Second)
-+
-+return nil
-+}
-+
-+func (s *targetOpenRC) Connect() (incus.InstanceServer, error) {
-+return incus.ConnectIncusUnix("/var/lib/incus/unix.socket", nil)
-+}
-+
-+func (s *targetOpenRC) Paths() (*DaemonPaths, error) {
-+return {
-+Daemon: "/var/lib/incus/",
-+Logs: "/var/log/incus/",
-+Cache: "/var/cache/incus/",
-+}, nil
-+}
diff --git a/app-containers/incus/incus-0.2-r1.ebuild
b/app-containers/incus/incus-0.2-r1.ebuild
deleted file mode 100644
index b5f6d80e988f..
--- a/app-containers/incus/incus-0.2-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine
manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/
[gentoo-commits] repo/gentoo:master commit in: app-containers/incus/files/, app-containers/incus/
commit: 7469a09067036c4887f0a7babdbe0a04123fe068
Author: Joonas Niilola gentoo org>
AuthorDate: Mon Oct 30 12:44:10 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Oct 30 12:44:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7469a090
app-containers/incus: lxd-to-incus: add upstream openrc patch
Signed-off-by: Joonas Niilola gentoo.org>
.../incus-0.2-lxd-to-incus-openrc-support.patch| 71 ++
.../{incus-0.2.ebuild => incus-0.2-r1.ebuild} | 6 +-
2 files changed, 74 insertions(+), 3 deletions(-)
diff --git
a/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch
b/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch
new file mode 100644
index ..9ab26752f9f8
--- /dev/null
+++ b/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch
@@ -0,0 +1,71 @@
+From 73f22c10770ba07ffe55e37480c5d50beb3c0c35 Mon Sep 17 00:00:00 2001
+From: xsoalokinx
+Date: Sun, 29 Oct 2023 07:42:02 +
+Subject: [PATCH] cmd/lxd-to-incus: Add OpenRC target support
+
+Signed-off-by: xsoalokinx
+---
+ cmd/lxd-to-incus/targets.go | 46 -
+ 1 file changed, 45 insertions(+), 1 deletion(-)
+
+diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go
+index ed84d3ebc..0940e1597 100644
+--- a/cmd/lxd-to-incus/targets.go
b/cmd/lxd-to-incus/targets.go
+@@ -16,7 +16,7 @@ type Target interface {
+ Paths() (*DaemonPaths, error)
+ }
+
+-var targets = []Target{{}}
++var targets = []Target{{}, {}}
+
+ type targetSystemd struct{}
+
+@@ -61,3 +61,47 @@ func (s *targetSystemd) Paths() (*DaemonPaths, error) {
+ Cache: "/var/cache/incus/",
+ }, nil
+ }
++
++type targetOpenRC struct{}
++
++func (s *targetOpenRC) Present() bool {
++if !util.PathExists("/var/lib/incus/") {
++return false
++}
++
++_, err := subprocess.RunCommand("rc-service", "--exists", "incus")
++if err != nil {
++return false
++}
++
++return true
++}
++
++func (s *targetOpenRC) Stop() error {
++_, err := subprocess.RunCommand("rc-service", "incus", "stop")
++return err
++}
++
++func (s *targetOpenRC) Start() error {
++_, err := subprocess.RunCommand("rc-service", "incus", "start")
++if err != nil {
++return err
++}
++
++// Wait for the socket to become available.
++time.Sleep(5 * time.Second)
++
++return nil
++}
++
++func (s *targetOpenRC) Connect() (incus.InstanceServer, error) {
++return incus.ConnectIncusUnix("/var/lib/incus/unix.socket", nil)
++}
++
++func (s *targetOpenRC) Paths() (*DaemonPaths, error) {
++return {
++Daemon: "/var/lib/incus/",
++Logs: "/var/log/incus/",
++Cache: "/var/cache/incus/",
++}, nil
++}
diff --git a/app-containers/incus/incus-0.2.ebuild
b/app-containers/incus/incus-0.2-r1.ebuild
similarity index 96%
rename from app-containers/incus/incus-0.2.ebuild
rename to app-containers/incus/incus-0.2-r1.ebuild
index 1ca35cc10b96..1adaedd82ad8 100644
--- a/app-containers/incus/incus-0.2.ebuild
+++ b/app-containers/incus/incus-0.2-r1.ebuild
@@ -81,6 +81,8 @@ RESTRICT="test"
GOPATH="${S}/_dist"
+PATCHES=( "${FILESDIR}"/incus-0.2-lxd-to-incus-openrc-support.patch )
+
src_prepare() {
export GOPATH="${S}/_dist"
@@ -174,10 +176,8 @@ pkg_postinst() {
elog "Please see"
elog " https://linuxcontainers.org/incus/introduction/;
elog "
https://linuxcontainers.org/incus/docs/main/tutorial/first_steps/;
- elog "
https://github.com/lxc/incus/blob/main/doc/howto/server_migrate_lxd.md;
+ elog "
https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/;
elog "before a Gentoo Wiki page is made."
- elog "Note that lxd-to-incus doesn't currently fully work on Gentoo,
and doesn't"
- elog "work at all on OpenRC systems."
elog
optfeature "virtual machine support"
app-emulation/qemu[spice,usbredir,virtfs]
optfeature "btrfs storage backend" sys-fs/btrfs-progs
