diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-01-04 07:58:30 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-04 07:58:30 +0000 |
| commit | 5e0583283abb5e0f998830cea3f4f9785699b2ed (patch) | |
| tree | c9999a88a0ae4409d0f85dc733d2b42181f94a53 /app-containers | |
| parent | fa3c4c282d03b85eb600bae6ec57b619004feb5a (diff) | |
gentoo auto-resync : 04:01:2024 - 07:58:30
Diffstat (limited to 'app-containers')
| -rw-r--r-- | app-containers/Manifest.gz | bin | 8896 -> 8895 bytes | |||
| -rw-r--r-- | app-containers/incus/Manifest | 4 | ||||
| -rw-r--r-- | app-containers/incus/incus-0.4-r1.ebuild (renamed from app-containers/incus/incus-0.4.ebuild) | 19 | ||||
| -rw-r--r-- | app-containers/incus/metadata.xml | 3 |
4 files changed, 19 insertions, 7 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz Binary files differindex 47302094eef9..b5690ec20551 100644 --- a/app-containers/Manifest.gz +++ b/app-containers/Manifest.gz diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest index 9a737e298dc8..acc15bf9f6d0 100644 --- a/app-containers/incus/Manifest +++ b/app-containers/incus/Manifest @@ -19,5 +19,5 @@ DIST incus-0.4.tar.xz 13544656 BLAKE2B 19f6dd9a0707d60e60b42fd586ed2a041a4ac66b0 DIST incus-0.4.tar.xz.asc 833 BLAKE2B 7d78d6808f8bbab78427ddc41925bde68a965e1594e0a90a56471c81f5f71798e286031caabb50ecf8a8b7b084660eefaf7644f2753d3810903e2f5194cf70fe SHA512 ce5bf32f7007a4dcf339b549da14ce9094ebe031311bd77707155d90e6ab05d1b56841910b934c96d9fed941815ce47ee746222100cee42d28bcc7c312c25bfb EBUILD incus-0.3-r1.ebuild 5256 BLAKE2B 88cc719bcd9f67aae827f2e53e17adebbb83b09b9d50d168b68afcf074c064fb5415302ea847d782b40a9c25447767b0b2553f3a22838adbba5046248eb47f45 SHA512 7d20e69dc5e3f5ff4cea2a42ec71677bc5d65a18e6f4281619faf041fec89bf672898c00214ecdaa7de258b852f8130e2123357559fcf55a242967d6eae20fd4 EBUILD incus-0.3.ebuild 5190 BLAKE2B e4e9ff9904f50eea1fe9a98774c022ed52de663b15405359a0fbacc670027e95b7f18b8665a820bc614b709b475eb6296fe0ce80817cb3ee9120fefac44b6dc5 SHA512 dae31f75947b52467c01e4b0f00f0b2884486c9c68591789fe77dbeffb832d86f57ffae3a6e7c9dd69b962357fa9d89dcfaa6f1115c821a66363862362e29fba -EBUILD incus-0.4.ebuild 5392 BLAKE2B f05560db7877255b9d480cbbbaabfea36167484b43d9f7cfda11907418a299017549ee5786d6b9175674252695da0b9229aa6f664e201e8cf4386bd9fe1daae9 SHA512 9924a45f39f2086f222560c2199389b5cd1a162f68465f4a72178fa2db14f289951a1010aec9d35a275a1787a8512fa32b22037f01945eb5da62823cc05ed077 -MISC metadata.xml 1471 BLAKE2B d3447fd360c4d3de95ffafefd39f9e65dd257cd39cbdb14fc2e2c513239fafe48b0fef44653fe8fdaaf54151afe59cf48f3f0909097d0c0c4a82cbd87aac4d44 SHA512 393edc7c7f202fac4f08abd2544d1fb41cfc83cea66ccf239eb4441c1f13ea85dd519de84094b1ba022b1a17658612591ee4354a77484da4d8095af917a87c25 +EBUILD incus-0.4-r1.ebuild 5534 BLAKE2B 555af9f265ac9f564104929032c6787156af76fbe8dbbccc3d8d25f6054d1d1b3a17c1cee148b1c1f8620c0382df38cb1d00dc5710fbb01c5f953bf942ceb00f SHA512 6088a80cd306887f155004429374249acb21b4bc152bd2914c3a9165f8c333aec1ef3cac057b6ea5f696149c840c7438769934ed3ca02757918353fdec875104 +MISC metadata.xml 1597 BLAKE2B 6e8ceafa8dca7d49fa754470c9645e11946d3419135ec3a12581e227945b64a13612a7eb3e833027bbf6d3c795acbaced979ba80f00a9e36f6831fb6111dd2d2 SHA512 d3c0ec128f715627addc5be758c87bea808626f9d9ada75aeac9be9a84039b68385ae65edfb5d57951ff4e7352565fbba040035da82ce8eaffcca585811d3577 diff --git a/app-containers/incus/incus-0.4.ebuild b/app-containers/incus/incus-0.4-r1.ebuild index 818070390ac2..422c94035e53 100644 --- a/app-containers/incus/incus-0.4.ebuild +++ b/app-containers/incus/incus-0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz LICENSE="Apache-2.0 BSD LGPL-3 MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="apparmor nls" +IUSE="apparmor fuidshift nls" DEPEND="acct-group/incus acct-group/incus-admin @@ -28,6 +28,7 @@ DEPEND="acct-group/incus sys-libs/libcap virtual/udev" RDEPEND="${DEPEND} + fuidshift? ( !app-containers/lxd ) net-firewall/ebtables net-firewall/iptables sys-apps/iproute2 @@ -123,11 +124,14 @@ src_compile() { export GOPATH="${S}/_dist" export CGO_LDFLAGS_ALLOW="-Wl,-z,now" - # fuidshift should be packaged for incus-lts, making it conflict with lxd. - for k in fuidshift incus-benchmark incus-user incus lxc-to-incus ; do + for k in incus-benchmark incus-user incus lxc-to-incus ; do ego install -v -x "${S}/cmd/${k}" done + if use fuidshift ; then + ego install -v -x "${S}/cmd/fuidshift" + fi + ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd # Needs to be built statically @@ -152,7 +156,7 @@ src_install() { newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup # Admin tools - for l in incusd incus-user fuidshift ; do + for l in incusd incus-user ; do dosbin ${bindir}/${l} done dosbin cmd/lxd-to-incus/lxd-to-incus @@ -162,6 +166,11 @@ src_install() { dobin ${bindir}/${m} done + # fuidshift, should be moved under admin tools at some point + if use fuidshift ; then + dosbin ${bindir}/fuidshift + fi + newconfd "${FILESDIR}"/incus-0.4.confd incus newinitd "${FILESDIR}"/incus-0.4.initd incus newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user diff --git a/app-containers/incus/metadata.xml b/app-containers/incus/metadata.xml index a7cc7908462b..adf7210ec6b7 100644 --- a/app-containers/incus/metadata.xml +++ b/app-containers/incus/metadata.xml @@ -9,6 +9,9 @@ <email>virtualization@gentoo.org</email> <name>Gentoo Virtualization Project</name> </maintainer> + <use> + <flag name="fuidshift">Install the fuidshift binary - currently conflicts with app-containers/lxd</flag> + </use> <longdescription> Incus is a modern, secure and powerful system container and virtual machine manager. Incus is a community fork from Canonical's LXD. |