summaryrefslogtreecommitdiff
path: root/app-emulation/lxd
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-16 09:32:48 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-16 09:32:48 +0100
commit9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
treeb690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-emulation/lxd
parentb17a3ef12038de50228bade1f05502c74e135321 (diff)
gentoo resync : 16.09.2020
Diffstat (limited to 'app-emulation/lxd')
-rw-r--r--app-emulation/lxd/Manifest4
-rw-r--r--app-emulation/lxd/lxd-4.0.2-r1.ebuild210
-rw-r--r--app-emulation/lxd/lxd-4.0.3.ebuild4
3 files changed, 3 insertions, 215 deletions
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 5ba621bde73a..ce13d937ee93 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -4,8 +4,6 @@ AUX lxd-4.0.0.service 519 BLAKE2B 5314820c25e52449aad8db6584739cbe0f2654111e4b42
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.0.2.tar.gz 25350601 BLAKE2B 2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad SHA512 6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077
DIST lxd-4.0.3.tar.gz 25468067 BLAKE2B 5c3d8a2841d3222d070be39fb6cb63c99450a7edea86915a808230012f1a3b7a66c2c4a3c56be378f586c8ca033c4f547ed6eeb14bb09a091b3ae28c62fda7ae SHA512 aaf7fe7473e04765263ff99f02041748f0e57abdd0311d734fbf1cbc461516bf6adad1bc42c9cfa58b4e87c28efb5186d9436fb0a1d309b23eb37fe95299ad6f
-EBUILD lxd-4.0.2-r1.ebuild 5846 BLAKE2B 971007fc37cef64b31066933ef37eeb06a16483084b695868e85964f511773f5daaaad5ce4bf816db8c682b9b9f016a132df51492adc0108ca94447d57a52181 SHA512 b8e3dcef848e84f3e5eb9372114d253dfd56afbc7162c926d979dd266b21acc93d3b4c31d6eac7af6699beadac6c722eef590c2d82f7240e14365b7331f4f15d
-EBUILD lxd-4.0.3.ebuild 5981 BLAKE2B 684762d5c0e7e7d122e34ee7684a4605f9bec9942b88b82ced6b87797b1cf8f5002d84362892eb6c29bc7ce8bc81958985069e6e7b8fb6625296d5ae58f053bf SHA512 9dc0004daded4e0a33557008635a7f4bf80adddaedf7aba2483972bbe29489d8577dabb864bf82ea1d5a6c7a1ae85503f55c864c84a68e12aa3c69ea3fb84ce1
+EBUILD lxd-4.0.3.ebuild 5984 BLAKE2B 0529634ba6f1931ad0262b3211c808389fd756254d2d56aab9d83d6afe3bf9b293fc30e941e254a084056618c4e2de33681f92406df3579d5473dd88d35422c6 SHA512 ce7522cc87605b1aa60d8e1aa92c8ccbd39615ac3d5639b8d365e366266dadb737b2513f50b8b679d3839b9b823957c0b39dd41a3b5543541071a64d1b8ff95d
MISC metadata.xml 777 BLAKE2B 6c318c07ba14314065e030abc924dc19a5149354705a7963de12a5ad1b61845f7e20bdf5a863e39f2e942a331f956cbae67f941f8fdeb4c5c358362d1d0fb6ac SHA512 af7acf4988ddf0c0d3029a05b26709e0b1fb1149cf002662061bc080e95402bb9d3df0e62c5d90b941919fc8b0e3e468edadbe67f47b879a73aa99cd648be919
diff --git a/app-emulation/lxd/lxd-4.0.2-r1.ebuild b/app-emulation/lxd/lxd-4.0.2-r1.ebuild
deleted file mode 100644
index 0eed136d3d5e..000000000000
--- a/app-emulation/lxd/lxd-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 eutils linux-info systemd
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-# Needs to include licenses for all bundled programs and libraries.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor +ipv6 nls"
-
-DEPEND="app-arch/xz-utils
- >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
- dev-lang/tcl
- dev-libs/libuv
- dev-libs/lzo
- net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
- acct-group/lxd
- net-firewall/ebtables
- net-firewall/iptables[ipv6?]
- sys-apps/iproute2[ipv6?]
- sys-fs/fuse:0=
- sys-fs/lxcfs
- sys-fs/squashfs-tools
- virtual/acl"
-BDEPEND="dev-lang/go
- nls? ( sys-devel/gettext )"
-
-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
- ~NF_NAT_MASQUERADE
- ~VSOCKETS
- ~VXLAN
-"
-
-# Uses internet connection.
-RESTRICT="test"
-
-# Go magic.
-QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
- /usr/bin/fuidshift
- /usr/bin/lxc
- /usr/bin/lxc-to-lxd
- /usr/bin/lxd-agent
- /usr/bin/lxd-benchmark
- /usr/bin/lxd-p2c
- /usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-common_op() {
- local i
- for i in dqlite raft; do
- cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
- "${@}"
- cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
- done
-}
-
-src_prepare() {
- default
-
- export GOPATH="${S}/_dist"
-
- sed -i \
- -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
- -e "s:make:make ${MAKEOPTS}:g" \
- Makefile || die
-
- sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
- sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
-
- common_op eautoreconf
-}
-
-src_configure() {
- export GOPATH="${S}/_dist"
-
- export CO_CFLAGS="-I${GOPATH}/deps/libco/"
- export CO_LIBS="${GOPATH}/deps/libco/"
-
- export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
- export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
-
- export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
- export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
-
- export PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
-
- cd "${GOPATH}/deps/sqlite" || die
- econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
-
- common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
-}
-
-src_compile() {
- export GOPATH="${S}/_dist"
-
- export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
- export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
- export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
-
- local j
- for j in sqlite raft libco; do
- cd "${GOPATH}"/deps/${j} || die
- emake
- done
-
- ln -s libco.so.0.1.0 libco.so || die
-
- cd "${GOPATH}/deps/dqlite" || die
- emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
-
- cd "${S}" || die
-
- for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
- go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
- done
-
- go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
- use nls && emake build-mo
-}
-
-src_test() {
- 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 || die
- go get -v -x github.com/remyoudompheng/go-misc/deadcode || die
- go get -v -x github.com/golang/lint/golint || die
- go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
- local bindir="_dist/bin"
- export GOPATH="${S}/_dist"
-
- dosbin ${bindir}/lxd
-
- for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
- dobin ${bindir}/${l}
- done
-
- for m in dqlite libco raft sqlite; do
- cd "${GOPATH}"/deps/${m} || die "failed switching into ${GOPATH}/${m}"
- emake DESTDIR="${D}" install
- done
-
- cd "${S}" || die
-
- # We only need libraries, and we don't want anything to link against these.
- rm "${ED}"/usr/bin/sqlite3 || die
- rm -r "${ED}"/usr/include || die
- rm -r "${ED}"/usr/lib/lxd/*.a || die
- rm -r "${ED}"/usr/lib/lxd/pkgconfig || die
-
- newbashcomp scripts/bash/lxd-client lxc
-
- newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
- newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
- if use apparmor; then
- systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
- else
- systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
- fi
-
- systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
- systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
- dodoc AUTHORS 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
- elog "Optional features:"
- 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."
-}
diff --git a/app-emulation/lxd/lxd-4.0.3.ebuild b/app-emulation/lxd/lxd-4.0.3.ebuild
index 6916707a2f41..abda07f1be07 100644
--- a/app-emulation/lxd/lxd-4.0.3.ebuild
+++ b/app-emulation/lxd/lxd-4.0.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools bash-completion-r1 eutils linux-info systemd
+inherit autotools bash-completion-r1 linux-info optfeature systemd
DESCRIPTION="Fast, dense and secure container management"
HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
# Needs to include licenses for all bundled programs and libraries.
LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="apparmor +ipv6 nls"
DEPEND="app-arch/xz-utils