diff options
Diffstat (limited to 'app-containers/incus')
| -rw-r--r-- | app-containers/incus/Manifest | 8 | ||||
| -rw-r--r-- | app-containers/incus/files/incus-0.5.1-handle-legacy-lxd-agent-loader.patch | 30 | ||||
| -rw-r--r-- | app-containers/incus/incus-0.3-r1.ebuild | 191 | ||||
| -rw-r--r-- | app-containers/incus/incus-0.5.1-r1.ebuild (renamed from app-containers/incus/incus-0.4-r1.ebuild) | 2 |
4 files changed, 34 insertions, 197 deletions
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest index 156e56f53ae2..3d5482210675 100644 --- a/app-containers/incus/Manifest +++ b/app-containers/incus/Manifest @@ -7,22 +7,18 @@ AUX incus-0.4.confd 702 BLAKE2B d1410842512d42b015626208336302940a169e504e0792d7 AUX incus-0.4.initd 1782 BLAKE2B 87dfde36250676bab6438a385acf87544b6e1ab150d057d3878cbdadc310e61893ba7cdc8802bd6fba00579d8c7b720c1d1644c75e9b9a8a69464e8cd6d28e17 SHA512 3661b64904141eb3240c5ac0f06a0513f772b531d9e0a2d6b33e0ca79788df45bed2327c017355379fea96f62f2009f20159e5e9056ce878a226a830cdc6fe8e AUX incus-0.4.service 620 BLAKE2B 8e9bee88c79adbdbcbf90ed9602e8f041277dc059dd294a01d7792e90bc70af4a1a40becc830ef140c66cb712b83f02a0761df37d19582ab34e34afe2ccc22da SHA512 44ede44e2450169704c5d0ebd540c3b646567b909fdf4ccaf3aef6ba1d344ed277f7325306a79117ae556c2d3aee4288c37aba87a58b3da1009f5cb609cd0ea5 AUX incus-0.4.socket 195 BLAKE2B 47fd548c3a3809dccab38303b0f103f59da4d57b9ccc7366574de6da161099a29e9065050ad9e47dc7b36b46af031c58ac45628468808d1f70ec63cc890ddb7a SHA512 f905d405f1031196e53297a6d0d83bde27a9571d9315fad39fb6940e11be4df89e91710f7f13cbeb9592e74eba5614307c95e6fa0642dbcc71e34a9a3ae5ee31 +AUX incus-0.5.1-handle-legacy-lxd-agent-loader.patch 1031 BLAKE2B 71d87c3d80c9727d1a64742d07efe7fc45fec38655a9355c848a5ad92f2c3f0abb42616b5612871079d5c1443f985b5ca98cfd044ca3815b591e83a836b99157 SHA512 ba294094ff22fadd67106ff1c851e7a2a0fa3e619eb59f8d9fc1ce12e60afa6bd96c01988b76467a69e1772982db44abed5535c3a333d65c20bcc2730d90c8cb AUX incus-containers-0.1.service 338 BLAKE2B af0849575d2d7578634228576fcf449f8ab54b6fa3a974baec4f91009dec4a6e76253f3724c532f38fc7484ccc6caffae4badf1591c1b04abb3414f4959d550c SHA512 9a9b072442a63683cb9ed71d706606da682e821f609f1f4daea0562ddcea1cc2d6157b29fd466e0aeab149f31b54ab0fff4cf41831e6b2378c47619b8dfd0b55 AUX incus-startup-0.4.service 297 BLAKE2B a9a13cdf5f966601fc28785072c7e05e6636d1f0583762cc220150ca94e930deb1b40a5d57cd2747ca0be67bd4548460b1ed48a8e67734d23101f86d909c3ba8 SHA512 21044267b73a8d59686d4d0a371cc5e74d4ad4c43331f1886a114e9e41cab4fd796da83469a766e360e75b0f356c3e2c4249c4b2f3ae36c3a2fccf539508bbb8 AUX incus-startup-0.4.sh 304 BLAKE2B a30c8a848ed2a3c8ff6eb2552bc59916eb01b178edf0f2036b54e8a02e41b7a534c4d5333b102344fec4804e50bde22dc916a575bd2b44333d90f15633be4fb6 SHA512 60706d6dc3bbf09337a557c0c4335e1b5147cc2a8b2fa15becac887fc36a27724ef385c94e0516b9050400e11d2d3db4e2a382b72ffd65b11475cc57ab4c9f4f AUX incus-user-0.4.initd 670 BLAKE2B 5481019916f573a71ee5dadd5a2fefac137951a9b7bb54da7b55376c4ab4b64f2c709904467cf7d14ebc7b297c9113b01064966388f082a52ea91b90c334c2d4 SHA512 048d4634b25c8000ea6c0bf856050016e04b29080c8a68a9924b58781a3093c3adf0f4ed88841bf297df659f370162d4d7296d2d15256f67ca6f6d5fa5af92ab AUX incus-user-0.4.service 247 BLAKE2B 97c181da8dc7c91e8effec89a8bac17b626e8e2f34e5d2212025d29543271903f16c3f878dbdb7eeddbde64a26714233be03e087281d50acdbb12a2d420bec96 SHA512 8d47426559af02e6d71d5fd10d858c21056af8d4e921c576bc1ae9d8827fdd24607360620383a7bbb1343c883d8a9d71fc783fecf377884c5c64015e6db37031 AUX incus-user-0.4.socket 204 BLAKE2B df26315099820f77fc875c1619078c0b3adc1cf131f4a2c5f3b6f91609bc07a4535d9fb24d20f91c77b0de7f8334442ba17c704310f35ccbc2864a6148f78389 SHA512 a2541cc29d87e96d6a2ebec1cb72dd5779648b4d739657cf123590c23ae00b8022ebf68a7a2af24cfdb9fcb89a05ec87ecd15e37f3160c7ceedf23f3a2459950 -DIST incus-0.3.tar.xz 13344380 BLAKE2B 8160843df4ff419ef8890fcdd6b6b7e2c3cdec509ae072ec195c2b2c44e61ab3dc20a0488e9023d891b7ee2f2c700cfb8206ebe29236c29705a7121e5436d64f SHA512 d3f3141f72a8ecf007faca8c2f2d1465d766d12f763e714d296fd28acd7e3095dd49834d428f42bf142e301cf1af7ee00ef74005d128c49aa147fb4d9348dbde -DIST incus-0.3.tar.xz.asc 833 BLAKE2B 532ee90f3ed1d4798a19dcc9df8fe6587ab5ab93d18accae7aae8e44cb8c8086c77702a572a371a966eee4ebed84a2d7941f52001152a1894e1d74aa235a06e0 SHA512 afd2aab52a19b618d194eab71974f84d1d3eb9639b2672d8e94153ac23b05764667374504b5f1355238341c4194de282d3bc7635335375fd347ba513eb66e685 -DIST incus-0.4.tar.xz 13544656 BLAKE2B 19f6dd9a0707d60e60b42fd586ed2a041a4ac66b071b8a8dc2f11e9fa6f11c3d4c464d4763babc22aa4e58e3964d079bdc3028848c460a5ebaed41573a4b3f65 SHA512 2d31f0dfa5408db9408946b4f872a051c792a2a47fb80962e62e6b6691c9c52c4532935f6d5bcbef05b80a1bc66f6cf68b1e61d148d8964569df0a98360c582e -DIST incus-0.4.tar.xz.asc 833 BLAKE2B 7d78d6808f8bbab78427ddc41925bde68a965e1594e0a90a56471c81f5f71798e286031caabb50ecf8a8b7b084660eefaf7644f2753d3810903e2f5194cf70fe SHA512 ce5bf32f7007a4dcf339b549da14ce9094ebe031311bd77707155d90e6ab05d1b56841910b934c96d9fed941815ce47ee746222100cee42d28bcc7c312c25bfb 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 -EBUILD incus-0.3-r1.ebuild 5256 BLAKE2B 88cc719bcd9f67aae827f2e53e17adebbb83b09b9d50d168b68afcf074c064fb5415302ea847d782b40a9c25447767b0b2553f3a22838adbba5046248eb47f45 SHA512 7d20e69dc5e3f5ff4cea2a42ec71677bc5d65a18e6f4281619faf041fec89bf672898c00214ecdaa7de258b852f8130e2123357559fcf55a242967d6eae20fd4 -EBUILD incus-0.4-r1.ebuild 5541 BLAKE2B 80b2910e7969839400d934920add9a89c4766243d691c39dc45ff77fd3fdd23e4d0b3c83e2e4338617b890d3888d50aab7486d730dab35085eb1124d72153dfe SHA512 2923a934228afcaa16b938690568eeca549e2cda9753132a2d4e94af6631d9231354445b11dd12faa98a9b3963499abe163c4174c10b87fc8749711336f1914f +EBUILD incus-0.5.1-r1.ebuild 5617 BLAKE2B f5a7753046d154bead6454ce6c5d25b6d2d6b02d6b9af6fd5c9f39f176fc5f628efb67234124b3301d2d1ac6d5f39c40e861638cc00972f8d7a7a5482c7c054c SHA512 46aaf600e745440f2ec8cd77fd69350a172ad02013e11f06c6a3014e2caa7e7057951db05c21f09fe4ae1ec692144800f0277e3c4495d8e30be2da4080c0e512 EBUILD incus-0.5.1.ebuild 5541 BLAKE2B 80b2910e7969839400d934920add9a89c4766243d691c39dc45ff77fd3fdd23e4d0b3c83e2e4338617b890d3888d50aab7486d730dab35085eb1124d72153dfe SHA512 2923a934228afcaa16b938690568eeca549e2cda9753132a2d4e94af6631d9231354445b11dd12faa98a9b3963499abe163c4174c10b87fc8749711336f1914f EBUILD incus-0.5.ebuild 5541 BLAKE2B 80b2910e7969839400d934920add9a89c4766243d691c39dc45ff77fd3fdd23e4d0b3c83e2e4338617b890d3888d50aab7486d730dab35085eb1124d72153dfe SHA512 2923a934228afcaa16b938690568eeca549e2cda9753132a2d4e94af6631d9231354445b11dd12faa98a9b3963499abe163c4174c10b87fc8749711336f1914f MISC metadata.xml 1597 BLAKE2B 6e8ceafa8dca7d49fa754470c9645e11946d3419135ec3a12581e227945b64a13612a7eb3e833027bbf6d3c795acbaced979ba80f00a9e36f6831fb6111dd2d2 SHA512 d3c0ec128f715627addc5be758c87bea808626f9d9ada75aeac9be9a84039b68385ae65edfb5d57951ff4e7352565fbba040035da82ce8eaffcca585811d3577 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 new file mode 100644 index 000000000000..472cf57cf273 --- /dev/null +++ b/app-containers/incus/files/incus-0.5.1-handle-legacy-lxd-agent-loader.patch @@ -0,0 +1,30 @@ +From aebcd59a3400f255aa9da97d271ec4c2b9ba4eb2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org> +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 <stgraber@stgraber.org> +--- + 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.3-r1.ebuild b/app-containers/incus/incus-0.3-r1.ebuild deleted file mode 100644 index 3b29b5fe5570..000000000000 --- a/app-containers/incus/incus-0.3-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/ 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" -IUSE="apparmor 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.17.1:=[lz4] - >=dev-util/xdelta-3.0[lzma(+)] - net-dns/dnsmasq[dhcp] - sys-libs/libcap - virtual/udev" -RDEPEND="${DEPEND} - 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 - 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/lxd-to-incus - /usr/sbin/incusd" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc - -# The testsuite must be run as root. -# make: *** [Makefile:156: check] Error 1 -RESTRICT="test" - -GOPATH="${S}/_dist" - -PATCHES=( "${FILESDIR}"/incus-0.3-lxd-5.20-compatibility.patch ) - -src_prepare() { - export GOPATH="${S}/_dist" - - default - - sed -i \ - -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \ - -e "s:make:make ${MAKEOPTS}:g" \ - Makefile || die - - # Fix hardcoded ovmf file path, see bug 763180 - sed -i \ - -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ - -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \ - doc/environment.md \ - internal/server/apparmor/instance.go \ - internal/server/apparmor/instance_qemu.go \ - internal/server/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." - - # Fix hardcoded virtfs-proxy-helper file path, see bug 798924 - sed -i \ - -e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \ - internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path." - - cp "${FILESDIR}"/incus-0.1.service "${T}"/incus.service || die - if use apparmor; then - sed -i \ - '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ - "${T}"/incus.service || die - fi - - # Disable -Werror's from go modules. - find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die -} - -src_configure() { :; } - -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 incus-benchmark incus-user incus lxc-to-incus ; do - ego install -v -x "${S}/cmd/${k}" - done - - ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd - - # Needs to be built statically - CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate - CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent - - cd "${S}"/cmd/lxd-to-incus || die - ego build -v -x ./ - cd "${S}" || die - - use nls && emake build-mo -} - -src_test() { - emake check -} - -src_install() { - export GOPATH="${S}/_dist" - local bindir="_dist/bin" - - dosbin ${bindir}/incusd - dosbin cmd/lxd-to-incus/lxd-to-incus - - for l in incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do - dobin ${bindir}/${l} - done - - dobashcomp scripts/bash/incus - - newconfd "${FILESDIR}"/incus-0.1.confd incus - newinitd "${FILESDIR}"/incus-0.1.initd incus - - systemd_dounit "${T}"/incus.service - systemd_newunit "${FILESDIR}"/incus-containers-0.1.service incus-containers.service - systemd_newunit "${FILESDIR}"/incus-0.1.socket incus.socket - - dodoc AUTHORS - dodoc -r doc/* - use nls && domo po/*.mo -} - -pkg_postinst() { - elog - elog "Please see" - elog " https://linuxcontainers.org/incus/introduction/" - elog " https://linuxcontainers.org/incus/docs/main/tutorial/first_steps/" - elog " https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/" - elog "before a Gentoo Wiki page is made." - elog - optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] - optfeature "btrfs storage backend" sys-fs/btrfs-progs - optfeature "ipv6 support" net-dns/dnsmasq[ipv6] - optfeature "full incus-migrate support" net-misc/rsync - optfeature "lvm2 storage backend" sys-fs/lvm2 - optfeature "zfs storage backend" sys-fs/zfs - elog - elog "Be sure to add your local user to the incus group." - elog -} diff --git a/app-containers/incus/incus-0.4-r1.ebuild b/app-containers/incus/incus-0.5.1-r1.ebuild index 72e99690331b..6060e5a3b598 100644 --- a/app-containers/incus/incus-0.4-r1.ebuild +++ b/app-containers/incus/incus-0.5.1-r1.ebuild @@ -83,6 +83,8 @@ RESTRICT="test" GOPATH="${S}/_dist" +PATCHES=( "${FILESDIR}"/incus-0.5.1-handle-legacy-lxd-agent-loader.patch ) + src_prepare() { export GOPATH="${S}/_dist" |