diff options
Diffstat (limited to 'app-containers')
-rw-r--r-- | app-containers/Manifest.gz | bin | 7550 -> 7551 bytes | |||
-rw-r--r-- | app-containers/lxd/Manifest | 5 | ||||
-rw-r--r-- | app-containers/lxd/lxd-5.0.1-r2.ebuild | 190 | ||||
-rw-r--r-- | app-containers/lxd/lxd-5.0.1-r6.ebuild (renamed from app-containers/lxd/lxd-5.0.1-r5.ebuild) | 7 | ||||
-rw-r--r-- | app-containers/lxd/lxd-5.0.2-r1.ebuild (renamed from app-containers/lxd/lxd-5.0.2.ebuild) | 7 |
5 files changed, 10 insertions, 199 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz Binary files differindex c23b8b555385..f6bd0266cc76 100644 --- a/app-containers/Manifest.gz +++ b/app-containers/Manifest.gz diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index 67a5eb7efafb..40a12909459e 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -12,7 +12,6 @@ DIST lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch 882 BLAKE DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b SHA512 e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21 SHA512 884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc DIST lxd-5.8-add-tcp-keepalives-to-exec-channels.patch 15702 BLAKE2B ee834b86284e36f87ad3e54df04eb2968dc0fefdf81b116bd640e611ac4ca2eb93763ed2c2f3cfd1e9473da1a3e66bd90858eb4bab08a47f86306a0903a19e6e SHA512 5e7c56f5ffbc8cecb27c6916abbbf4bb3d268c0936b9fdb2b80b4b306c911bdcf782059290243988feb49c9209e55de9ea168ea7041636bf9ae1b7d88ff541c9 -EBUILD lxd-5.0.1-r2.ebuild 5268 BLAKE2B b0d0d8601fe9dfda083f98078aa404e04cc4c82098583bc3b8bcee76b4f46f1eadd097a05ffb62111ab929a42f3af2377de9302f3acaeeca5056d85ef460715f SHA512 540ef775bc0558a59dad52220d1f8d9de6f0dd4aa57eff7e18beefefc2263651d9edf5fb0e993d724b4e03145f0250efa074cfb11d0e5e9997dcd5b968a2997c -EBUILD lxd-5.0.1-r5.ebuild 6235 BLAKE2B 95efb03e4ad618bd92d6a22311a135a9a096bb0742a15a3191254620f05604ae5e10fddc97883e06d6dabfa4972fa62899751e23a98f53d3235733f37ddd2ec2 SHA512 6d39152adabe406e568d39e6a3d696e4d3f554d66b063a4827f596ebc6e034f346a086faaedbc6de7a3e7a94c01b9d412533e81e1d5f1671e2fb75074ba52d61 -EBUILD lxd-5.0.2.ebuild 5735 BLAKE2B efd35039e5b0663cf5b1bfa8d6d46d8072d9f60c3719dd8797fa5eb1640c0717493da343b43013623d27e0f74f33b11142a7e3f345b015c094a76c94ee8e2bb5 SHA512 e247131eddcd3d866f67e28978f02ea6fd19280e3a7913afddc7f57a49e36e199ae8faef5bcecd739c632a203077e412aeb640408380a4c82bb97f950261d000 +EBUILD lxd-5.0.1-r6.ebuild 6310 BLAKE2B 37d9bdb6fd55ecba5ad93f82f39689881973a5b68a6f3699074ecfca35346e75e27e0cb30f35f95d69332428c55d3f475b7de41eec0f617afd593e334d2ab7f9 SHA512 ea6d8912d4d10e8bb24f9b1daa7cc891b8e93dc2341ee8e800c39b4160f248550cb2406bb354e61a2c5e41bf1093653d7db2fac733a2dd1c227fed404d9d3bb9 +EBUILD lxd-5.0.2-r1.ebuild 5810 BLAKE2B 4058c3c46d4572494f4473c23da45a6cef175ae07860428ee0f1f70071f57df681fa377c2f3f2508b105314945eb7ca02da486dc26571520e1c1cea2558bc4b2 SHA512 67ff049b3d4048539e4b43f9fa5ba7df8f1b723893c93a0fcc1b9b20c78919ba5543872cd2fc4856062366bff2d8b19af88305001528a54dd61e4dfea9170ba1 MISC metadata.xml 1403 BLAKE2B 4bff140bc9282b41631293b9cc28a5f85bec2b0f923c762c6572e75b752aba113632747142bd3b3a87322ce8d2ba10fd15afe3f1a7c1384e49c408ca176f267d SHA512 38fb2faa661a8473d0221117299baea01c06f46e5fbf5bd7e32f26b7d0a433ab35c5e0e5dde42c7478b7118489d619fdacca29b3a9b0e89cf432c5bccd3ffba3 diff --git a/app-containers/lxd/lxd-5.0.1-r2.ebuild b/app-containers/lxd/lxd-5.0.1-r2.ebuild deleted file mode 100644 index 6ef72f36e908..000000000000 --- a/app-containers/lxd/lxd-5.0.1-r2.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2022 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/lxd/introduction/ https://github.com/lxc/lxd" -SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="apparmor ipv6 nls verify-sig" - -DEPEND="acct-group/lxd - app-arch/xz-utils - >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] - dev-db/sqlite:3 - dev-libs/dqlite:= - dev-libs/lzo - dev-libs/raft[lz4] - >=dev-util/xdelta-3.0[lzma(+)] - net-dns/dnsmasq[dhcp,ipv6(+)?] - sys-libs/libcap - virtual/udev" -RDEPEND="${DEPEND} - net-firewall/ebtables - net-firewall/iptables[ipv6(+)?] - sys-apps/iproute2[ipv6(+)?] - 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/fuidshift - /usr/bin/lxc - /usr/bin/lxc-to-lxd - /usr/bin/lxd-agent - /usr/bin/lxd-benchmark - /usr/bin/lxd-migrate - /usr/sbin/lxd" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc - -# The testsuite must be run as root. -# make: *** [Makefile:156: check] Error 1 -RESTRICT="test" - -GOPATH="${S}/_dist" - -src_prepare() { - export GOPATH="${S}/_dist" - - default - - sed -i \ - -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd: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 \ - lxd/apparmor/instance.go \ - lxd/apparmor/instance_qemu.go \ - lxd/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" \ - lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path." - - cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die - if use apparmor; then - sed -i \ - '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ - "${T}"/lxd.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" - - for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do - go install -v -x "${S}/${k}" || die "failed compiling ${k}" - done - - go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon" - - # Needs to be built statically - CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate - CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent - - use nls && emake build-mo -} - -src_test() { - emake check -} - -src_install() { - export GOPATH="${S}/_dist" - local bindir="_dist/bin" - - dosbin ${bindir}/lxd - - for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do - dobin ${bindir}/${l} - done - - newbashcomp scripts/bash/lxd-client lxc - - newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd - newinitd "${FILESDIR}"/lxd-4.0.9.initd lxd - - systemd_dounit "${T}"/lxd.service - systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service - systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket - - dodoc AUTHORS - dodoc -r doc/* - use nls && domo po/*.mo -} - -pkg_postinst() { - elog - elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," - elog "including a Quick Start." - elog "For virtual machine support, see:" - elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines" - elog - elog "Please run 'lxc-checkconfig' to see all optional kernel features." - elog - optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] - optfeature "btrfs storage backend" sys-fs/btrfs-progs - 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 lxd group." - - if [[ -n ${REPLACING_VERSIONS} ]] && has_version app-emulation/qemu[spice,usbredir,virtfs]; then - ewarn "" - ewarn "You're updating from <5.0.1. Due to incompatible API updates in the lxd-agent" - ewarn "product, you'll have to restart any running virtual machines before they work" - ewarn "properly." - ewarn "" - ewarn "Run: 'lxc restart your-vm' after the update for your vm's managed by lxd." - ewarn "" - fi -} diff --git a/app-containers/lxd/lxd-5.0.1-r5.ebuild b/app-containers/lxd/lxd-5.0.1-r6.ebuild index 86323cc0f95d..944e9f88133b 100644 --- a/app-containers/lxd/lxd-5.0.1-r5.ebuild +++ b/app-containers/lxd/lxd-5.0.1-r6.ebuild @@ -25,13 +25,13 @@ DEPEND="acct-group/lxd dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] - net-dns/dnsmasq[dhcp,ipv6(+)] + net-dns/dnsmasq[dhcp] sys-libs/libcap virtual/udev" RDEPEND="${DEPEND} net-firewall/ebtables - net-firewall/iptables[ipv6(+)] - sys-apps/iproute2[ipv6(+)] + net-firewall/iptables + sys-apps/iproute2 sys-fs/fuse:* >=sys-fs/lxcfs-5.0.0 sys-fs/squashfs-tools[lzma] @@ -187,6 +187,7 @@ pkg_postinst() { 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] net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6] optfeature "lvm2 storage backend" sys-fs/lvm2 optfeature "zfs storage backend" sys-fs/zfs elog diff --git a/app-containers/lxd/lxd-5.0.2.ebuild b/app-containers/lxd/lxd-5.0.2-r1.ebuild index 4ce69e48b15f..f361e6e12a6d 100644 --- a/app-containers/lxd/lxd-5.0.2.ebuild +++ b/app-containers/lxd/lxd-5.0.2-r1.ebuild @@ -23,13 +23,13 @@ DEPEND="acct-group/lxd dev-libs/lzo >=dev-libs/raft-0.17.1:=[lz4] >=dev-util/xdelta-3.0[lzma(+)] - net-dns/dnsmasq[dhcp,ipv6(+)] + net-dns/dnsmasq[dhcp] sys-libs/libcap virtual/udev" RDEPEND="${DEPEND} net-firewall/ebtables - net-firewall/iptables[ipv6(+)] - sys-apps/iproute2[ipv6(+)] + net-firewall/iptables + sys-apps/iproute2 sys-fs/fuse:* >=sys-fs/lxcfs-5.0.0 sys-fs/squashfs-tools[lzma] @@ -175,6 +175,7 @@ pkg_postinst() { 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] net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6] optfeature "lvm2 storage backend" sys-fs/lvm2 optfeature "zfs storage backend" sys-fs/zfs elog |