From eac73c2b18b1af8797c4d45847d6177e79c12c74 Mon Sep 17 00:00:00 2001 From: Ronald Farrer Date: Thu, 12 Aug 2021 11:22:45 -0700 Subject: [PATCH] Removed broken lxd ebuild. --- app-emulation/lxd/Manifest | 9 - app-emulation/lxd/files/lxd-4.0.0.confd | 23 -- app-emulation/lxd/files/lxd-4.0.0.initd | 47 ---- app-emulation/lxd/files/lxd-4.0.0.service | 20 -- app-emulation/lxd/files/lxd-4.0.0.socket | 12 - .../lxd/files/lxd-4.0.0_apparmor.service | 21 -- .../lxd/files/lxd-containers-4.0.0.service | 16 -- app-emulation/lxd/lxd-4.17.ebuild | 233 ------------------ app-emulation/lxd/metadata.xml | 20 -- 9 files changed, 401 deletions(-) delete mode 100644 app-emulation/lxd/Manifest delete mode 100644 app-emulation/lxd/files/lxd-4.0.0.confd delete mode 100644 app-emulation/lxd/files/lxd-4.0.0.initd delete mode 100644 app-emulation/lxd/files/lxd-4.0.0.service delete mode 100644 app-emulation/lxd/files/lxd-4.0.0.socket delete mode 100644 app-emulation/lxd/files/lxd-4.0.0_apparmor.service delete mode 100644 app-emulation/lxd/files/lxd-containers-4.0.0.service delete mode 100644 app-emulation/lxd/lxd-4.17.ebuild delete mode 100644 app-emulation/lxd/metadata.xml diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest deleted file mode 100644 index 05396f3..0000000 --- a/app-emulation/lxd/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4 -AUX lxd-4.0.0.initd 1221 BLAKE2B cdff6d900e09f85d9a4dc86b30f0d32b848689e209b79b48217e2f844a48fb358850cbc27db1aed7c1b957bbc19af2d76856fd65319a0a207cedfefbadf659cc SHA512 8b176036c1e5f2ffac4c94e781694fb637fa53666f10da1d5d2b3f1fc341f02003e5306dbd332edd9eeb6f7b08dffd9190c7f65361a40220f6f88d56e4c78a57 -AUX lxd-4.0.0.service 519 BLAKE2B 5314820c25e52449aad8db6584739cbe0f2654111e4b42c3eef0df995373487c789390dee99420dfd1aa5768ba66ba72999e8f2d8a3b0be6e621185f185b5b85 SHA512 c68c4106e189bd32538f5f2963c43afc30418dd9afeca56e5590f354725eb0126ee0aac02082cc42d69b851f392a4977a4f95cf2886044ad563c9a36facea222 -AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661 -AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67fb50360b11791cbd1ab1953fdfe5eb726e22b7091bb8e45c294b772e6b00e9ca65833512eb5b570627fa3234812e SHA512 364764d007f4800138c712fce70fe28b096b6e35dc6d2e4f8aa9aff4b335ecec7dfc9600a1a16cd38e69a96534b7462daf5f6e946a2ee81bce17977b8d5911db -AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718 -DIST lxd-4.17.tar.gz 15930575 BLAKE2B 8d4ec6a63daa348cebb50e9cc7568626dfba39fc2e409fe562ed9fe115478754df5a10803c0bde10112d6f70e0236f276cdc14c62f9a6f2b505c04e0bc270443 SHA512 c7570c6ba0b7c8f0025dcc185fa2a073b28b5d5589d49cb3340b8bd25d99d3bf0e5a9887e212e5ca88caf9c744052a038f7d2399f1386ebf6f0050a189c391b9 -EBUILD lxd-4.17.ebuild 6454 BLAKE2B d2bf297eef43330169dbbfc1f59a3e5c302ddbfdf297838f0b009b8508c9d939343147973a75a1da71e9db1584637948910505863f07dde721d4ae6eb845894c SHA512 c5430333a2c5e10f42774445f61086a6a7b34634e6dee8cd2df9c5dbd553aa187e513f4583cdd655afdb6697328f17b09bfdcc7840331029c0db3914d588b06c -MISC metadata.xml 614 BLAKE2B 9e3b2ece887f337fa3574d2b3466ae5448426ecd50c189af885bf5c2b9dc28e240569efb6c280b83b47e4c6b91fa0f45c7a237240ebda21169c1be76332b09cb SHA512 98acc201befa71acafd9ab8f67959e658269071c4903ef822dd10770903ca8fb34fa7a0b7f47e080783377a44a0098770dabd57262ec9c31f6ffc736f6ca4b55 diff --git a/app-emulation/lxd/files/lxd-4.0.0.confd b/app-emulation/lxd/files/lxd-4.0.0.confd deleted file mode 100644 index 68cf344..0000000 --- a/app-emulation/lxd/files/lxd-4.0.0.confd +++ /dev/null @@ -1,23 +0,0 @@ -# Group which owns the shared socket -LXD_OPTIONS+=" --group lxd" - -# Enable cpu profiling into the specified file -#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile" - -# Enable memory profiling into the specified file -#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile" - -# Enable debug mode -#LXD_OPTIONS+=" --debug" - -# For debugging, print a complete stack trace every n seconds -#LXD_OPTIONS+=" --print-goroutines-every 5" - -# Enable verbose mode -#LXD_OPTIONS+=" -v" - -# Logfile to log to -#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log" - -# Enable syslog logging -#LXD_OPTIONS+=" --syslog" diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd deleted file mode 100644 index e6ae971..0000000 --- a/app-emulation/lxd/files/lxd-4.0.0.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -DAEMON=/usr/sbin/lxd -PIDFILE=/run/lxd.pid - -depend() { - need net - need lxcfs -} - -start() { - ebegin "Starting lxd service" - - modprobe -f loop > /dev/null 2>&1 - - # fix permissions on /var/lib/lxd and make sure it exists - install -d /var/lib/lxd --group lxd --owner root --mode 0775 - start-stop-daemon --start \ - --pidfile ${PIDFILE} \ - --exec ${DAEMON} \ - --background \ - --make-pidfile \ - -- \ - ${LXD_OPTIONS} - eend ${?} -} - -stop() { - if [ "${RC_CMD}" = restart ]; then - ebegin "Stopping lxd service (but not containers)" - # start-stop-daemon sends SIGTERM with a timeout of 5s by default. - # SIGTERM indicates to LXD that it will be stopped temporarily. - # Instances will keep running. - start-stop-daemon --stop --quiet -p "${PIDFILE}" - eend ${?} - else - ebegin "Stopping lxd service and containers, waiting 40s" - # SIGPWR indicates to LXD that the host is going down. - # LXD will do a clean shutdown of all instances. - # After 30s all remaining instances will be killed. - # We wait up to 40s for LXD. - start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}" - eend ${?} - fi -} diff --git a/app-emulation/lxd/files/lxd-4.0.0.service b/app-emulation/lxd/files/lxd-4.0.0.service deleted file mode 100644 index c2e9db8..0000000 --- a/app-emulation/lxd/files/lxd-4.0.0.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=LXD - main daemon -After=network-online.target lxcfs.service lxd.socket -Requires=network-online.target lxcfs.service lxd.socket -Documentation=man:lxd(1) - -[Service] -EnvironmentFile=-/etc/environment -ExecStart=/usr/sbin/lxd --group lxd --logfile=/var/log/lxd/lxd.log -ExecStartPost=/usr/sbin/lxd waitready --timeout=600 -KillMode=process -TimeoutStartSec=600s -TimeoutStopSec=30s -Restart=on-failure -LimitNOFILE=1048576 -LimitNPROC=infinity -TasksMax=infinity - -[Install] -Also=lxd-containers.service lxd.socket diff --git a/app-emulation/lxd/files/lxd-4.0.0.socket b/app-emulation/lxd/files/lxd-4.0.0.socket deleted file mode 100644 index 3207c94..0000000 --- a/app-emulation/lxd/files/lxd-4.0.0.socket +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=LXD - unix socket -Documentation=man:lxd(1) - -[Socket] -ListenStream=/var/lib/lxd/unix.socket -SocketGroup=lxd -SocketMode=0660 -Service=lxd.service - -[Install] -WantedBy=sockets.target diff --git a/app-emulation/lxd/files/lxd-4.0.0_apparmor.service b/app-emulation/lxd/files/lxd-4.0.0_apparmor.service deleted file mode 100644 index 5e688d9..0000000 --- a/app-emulation/lxd/files/lxd-4.0.0_apparmor.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=LXD - main daemon -After=network-online.target lxcfs.service lxd.socket -Requires=network-online.target lxcfs.service lxd.socket -Documentation=man:lxd(1) - -[Service] -EnvironmentFile=-/etc/environment -ExecStartPre=/usr/libexec/lxc/lxc-apparmor-load -ExecStart=/usr/sbin/lxd --group lxd --logfile=/var/log/lxd/lxd.log -ExecStartPost=/usr/sbin/lxd waitready --timeout=600 -KillMode=process -TimeoutStartSec=600s -TimeoutStopSec=30s -Restart=on-failure -LimitNOFILE=1048576 -LimitNPROC=infinity -TasksMax=infinity - -[Install] -Also=lxd-containers.service lxd.socket diff --git a/app-emulation/lxd/files/lxd-containers-4.0.0.service b/app-emulation/lxd/files/lxd-containers-4.0.0.service deleted file mode 100644 index 894760c..0000000 --- a/app-emulation/lxd/files/lxd-containers-4.0.0.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=LXD - container startup/shutdown -Documentation=man:lxd(1) -After=lxd.socket lxd.service -Requires=lxd.socket - -[Service] -Type=oneshot -ExecStart=/usr/sbin/lxd activateifneeded -ExecStop=/usr/sbin/lxd shutdown -TimeoutStartSec=600s -TimeoutStopSec=600s -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/app-emulation/lxd/lxd-4.17.ebuild b/app-emulation/lxd/lxd-4.17.ebuild deleted file mode 100644 index ac88222..0000000 --- a/app-emulation/lxd/lxd-4.17.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 2020-2021 LiGurOs Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -DESCRIPTION="Fast, dense and secure container management" -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" - -LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" -SLOT="1" -KEYWORDS="amd64 ~arm ~arm64 x86" - -IUSE="+daemon +ipv6 +dnsmasq nls test +tools" - -inherit autotools bash-completion-r1 linux-info systemd user - -SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz" - -DEPEND=" - acct-group/lxd - >=dev-libs/raft-0.9.22 - >=dev-db/sqlite-3.25 - dev-lang/tcl - >=dev-lang/go-1.9.4 - dev-libs/libuv - dev-libs/protobuf - nls? ( sys-devel/gettext ) - test? ( - app-misc/jq - net-misc/curl - sys-devel/gettext - ) -" - -RDEPEND=" - daemon? ( - dev-libs/raft - app-arch/xz-utils - >=app-emulation/lxc-4.0.0 - dev-libs/libuv - dev-libs/lzo - dev-util/xdelta:3 - dnsmasq? ( - net-dns/dnsmasq[dhcp,ipv6?] - ) - net-firewall/ebtables - net-firewall/iptables[ipv6?] - net-libs/libnfnetlink - net-libs/libnsl:0= - net-misc/rsync[xattr] - sys-apps/iproute2[ipv6?] - sys-fs/fuse - sys-fs/lxcfs - sys-fs/squashfs-tools[lzma] - virtual/acl - ) -" - -CONFIG_CHECK=" - ~BRIDGE - ~DUMMY - ~IP6_NF_NAT - ~IP6_NF_TARGET_MASQUERADE - ~IPV6 - ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE - ~MACVLAN - ~NETFILTER_XT_MATCH_COMMENT - ~NET_IPGRE - ~NET_IPGRE_DEMUX - ~NET_IPIP - ~VXLAN -" - -ERROR_BRIDGE="BRIDGE: needed for network commands" -ERROR_DUMMY="DUMMY: needed for network commands" -ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands" -ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands" -ERROR_IPV6="IPV6: needed for network commands" -ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands" -ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands" -ERROR_MACVLAN="MACVLAN: needed for network commands" -ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands" -ERROR_NET_IPGRE="NET_IPGRE: needed for network commands" -ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands" -ERROR_NET_IPIP="NET_IPIP: needed for network commands" -ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands" -ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands" -ERROR_VXLAN="VXLAN: needed for network commands" - -EGO_PN="github.com/lxc/lxd" - -src_prepare() { - default - eapply_user - - cd "${S}/_dist/deps/dqlite" || die "Can't cd to dqlite dir" - eautoreconf -} - -src_configure() { - export GOPATH="${S}/_dist" - - cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" - econf --libdir=${EPREFIX}/usr/lib/lxd -} - -src_compile() { - export GOPATH="${S}/_dist" - - cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" - emake CFLAGS="-I${GOPATH}/deps/sqlite" LDFLAGS="-L${GOPATH}/deps/sqlite" - - # We don't use the Makefile here because it builds targets with the - # assumption that `pwd` is in a deep gopath namespace, which we're not. - # It's simpler to manually call "go install" than patching the Makefile. - cd "${S}" - GO111MODULE=auto go install -v -x ${EGO_PN}/lxc || die "Failed to build the client" - - if use daemon; then - - # LXD depends on a patched, bundled sqlite with replication - # capabilities. - export CGO_CFLAGS="-I${GOPATH}/deps/dqlite/include/" - export CGO_LDFLAGS="-L${GOPATH}/deps/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd" - export LD_LIBRARY_PATH="${GOPATH}/deps/dqlite/.libs/" - - GO111MODULE=auto go install -v -x ${EGO_PN}/lxd || die "Failed to build the daemon" - fi - - if use tools; then - GO111MODULE=auto go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift" - GO111MODULE=auto go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd" - GO111MODULE=auto go install -v -x ${EGO_PN}/lxd-agent || die "Failed to build lxd-agent" - GO111MODULE=auto go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark" - GO111MODULE=auto go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c" - fi - - use nls && emake build-mo - - mkdir _dist/man - ./_dist/bin/lxc manpage _dist/man/ -} - -src_test() { - if use daemon; then - export GOPATH="${S}/_dist" - # This is mostly a copy/paste from the Makefile's "check" rule, but - # patching the Makefile to work in a non "fully-qualified" go namespace - # was more complicated than this modest copy/paste. - # Also: sorry, for now a network connection is needed to run tests. - # Will properly bundle test dependencies later. - go get -v -x github.com/rogpeppe/godeps - go get -v -x github.com/remyoudompheng/go-misc/deadcode - go get -v -x github.com/golang/lint/golint - go test -v ${EGO_PN}/lxd - else - einfo "No tests to run for client-only builds" - fi -} - -src_install() { - local bindir="_dist/bin" - dobin ${bindir}/lxc - if use daemon; then - - export GOPATH="${S}/_dist" - - cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" - emake DESTDIR="${D}" install - - # Must only install libs - rm -r "${D}/usr/include" || die "Can't remove include directory" - - cd "${S}" || die "Can't cd to \${S}" - dosbin ${bindir}/lxd - fi - - if use tools; then - dobin ${bindir}/fuidshift - dobin ${bindir}/lxc-to-lxd - dobin ${bindir}/lxd-agent - dobin ${bindir}/lxd-benchmark - dobin ${bindir}/lxd-p2c - fi - - insinto /etc/sysctl.d - newins "${FILESDIR}/${PN}-sysctl.conf" 60-${PN}.conf - - if use nls; then - domo po/*.mo - fi - - if use daemon; then - newinitd "${FILESDIR}"/${PN}.initd lxd - newconfd "${FILESDIR}"/${PN}.confd lxd - - systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service - fi - - newbashcomp scripts/bash/lxd-client lxc - - doman _dist/man/* - dodoc AUTHORS doc/* -} - -pkg_postinst() { - elog - elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," - elog "including a Quick Start." - - # The messaging below only applies to daemon installs - use daemon || return 0 - - # Ubuntu also defines an lxd user but it appears unused (the daemon - # must run as root) - elog - elog "Though not strictly required, some features are enabled at run-time" - elog "when the relevant helper programs are detected:" - elog "- sys-apps/apparmor" - elog "- sys-fs/btrfs-progs" - elog "- sys-fs/lvm2" - elog "- sys-fs/zfs" - elog "- sys-process/criu" - elog - elog "Since these features can't be disabled at build-time they are" - elog "not USE-conditional." - elog - elog "Be sure to add your local user to the lxd group." - elog - elog "Networks with bridge.mode=fan are unsupported due to requiring" - elog "a patched kernel and iproute2." -} - diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml deleted file mode 100644 index 0891ba1..0000000 --- a/app-emulation/lxd/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - canutethegreat@gmail.com - Ronald Farrer - - - Enable AppArmor support - - - By combining the speed and density of containers with - the security of traditional virtual machines, LXD is - the next-generation of container hypervisor for Linux - from Canonical. - - - lxc/lxd - -