public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Erik Mackdanz" <stasibear@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/
Date: Sun,  9 Sep 2018 22:51:12 +0000 (UTC)	[thread overview]
Message-ID: <1536533443.466f357db24e56349ca2f09e05a4b406087d62c0.stasibear@gentoo> (raw)

commit:     466f357db24e56349ca2f09e05a4b406087d62c0
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  9 22:49:53 2018 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Sep  9 22:50:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466f357d

app-emulation/lxd: Fix missing dep, fix bad linking

Closes: https://bugs.gentoo.org/664394
Closes: https://bugs.gentoo.org/664990
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 app-emulation/lxd/lxd-3.4-r1.ebuild | 233 ++++++++++++++++++++++++++++++++++++
 1 file changed, 233 insertions(+)

diff --git a/app-emulation/lxd/lxd-3.4-r1.ebuild b/app-emulation/lxd/lxd-3.4-r1.ebuild
new file mode 100644
index 00000000000..0988eae3ecc
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.4-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="0"
+KEYWORDS="~amd64"
+
+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="
+	dev-lang/tcl
+	>=dev-lang/go-1.9.4
+	dev-libs/protobuf
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-arch/xz-utils
+		>=app-emulation/lxc-2.0.7[seccomp]
+		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-misc/rsync[xattr]
+		sys-apps/iproute2[ipv6?]
+		sys-fs/fuse
+		sys-fs/lxcfs
+		sys-fs/squashfs-tools
+		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
+	~NF_NAT_MASQUERADE_IPV4
+	~NF_NAT_MASQUERADE_IPV6
+	~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() {
+	eapply_user
+	eapply "${FILESDIR}/de-translation-newline.patch"
+
+	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+	eautoreconf
+}
+
+src_configure() {
+	export GOPATH="${S}/dist"
+	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
+
+	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
+}
+
+src_compile() {
+	export GOPATH="${S}/dist"
+
+	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+	emake
+
+	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+	emake CFLAGS="-I${GOPATH}/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}"
+	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}/sqlite/ -I${GOPATH}/dqlite/include/"
+		export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
+		export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/"
+
+		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+	fi
+
+	if use tools; then
+		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
+		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
+		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
+	fi
+
+	use nls && emake build-mo
+}
+
+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}/sqlite" || die "Can't cd to sqlite dir"
+		emake DESTDIR="${D}" install
+
+		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+		emake DESTDIR="${D}" install
+
+		# Must only install libs
+		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
+		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-benchmark
+	fi
+
+	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
+
+	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
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# 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."
+}
+
+# TODO:
+# - man page, I don't see cobra generating it


             reply	other threads:[~2018-09-09 22:51 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-09 22:51 Erik Mackdanz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-11  7:17 [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/ Joonas Niilola
2021-11-17  6:29 Joonas Niilola
2021-11-10  7:02 Joonas Niilola
2021-11-10  7:02 Joonas Niilola
2021-10-22 17:21 Joonas Niilola
2021-10-10  6:29 Joonas Niilola
2021-10-10  6:29 Joonas Niilola
2021-10-04  5:40 Joonas Niilola
2021-08-25  7:09 Joonas Niilola
2021-08-19  6:23 Joonas Niilola
2021-07-19 11:15 Joonas Niilola
2021-07-19 11:15 Joonas Niilola
2021-07-14 13:05 Joonas Niilola
2021-06-30  4:48 Joonas Niilola
2021-06-01  8:43 Joonas Niilola
2021-05-01  5:38 Joonas Niilola
2021-04-28  5:57 Joonas Niilola
2021-04-26 10:08 Joonas Niilola
2021-03-09  9:26 Joonas Niilola
2021-03-08 10:25 Sam James
2021-03-07  9:03 Joonas Niilola
2021-02-19  7:37 Joonas Niilola
2021-01-30  6:38 Joonas Niilola
2021-01-30  6:38 Joonas Niilola
2021-01-30  6:38 Joonas Niilola
2021-01-14  4:20 Joonas Niilola
2021-01-04  5:18 Joonas Niilola
2020-12-15  7:18 Joonas Niilola
2020-12-09  8:04 Joonas Niilola
2020-10-23  7:37 Joonas Niilola
2020-10-20  5:43 Joonas Niilola
2020-09-22  6:54 Joonas Niilola
2020-09-14  5:11 Joonas Niilola
2020-09-14  5:11 Joonas Niilola
2020-08-15  6:19 Joonas Niilola
2020-08-12 13:03 Joonas Niilola
2020-07-17  8:14 Joonas Niilola
2020-07-13  7:19 Joonas Niilola
2020-07-13  7:16 Joonas Niilola
2020-06-26  8:13 Joonas Niilola
2020-06-21 17:02 Joonas Niilola
2020-05-29 13:15 Joonas Niilola
2020-05-15  8:57 Joonas Niilola
2020-05-15  8:30 Joonas Niilola
2019-11-18 20:54 Tim Harder
2019-09-09  2:58 Erik Mackdanz
2019-09-08 22:47 Erik Mackdanz
2019-07-05 19:05 Virgil Dupras
2019-07-01 14:25 Erik Mackdanz
2019-07-01 14:25 Erik Mackdanz
2019-07-01 13:52 Erik Mackdanz
2019-04-07  3:59 Erik Mackdanz
2019-04-02  4:15 Erik Mackdanz
2019-04-02  4:00 Erik Mackdanz
2019-04-02  3:57 Erik Mackdanz
2019-02-08  3:55 Erik Mackdanz
2019-01-19 17:25 Erik Mackdanz
2019-01-19 17:12 Erik Mackdanz
2018-12-15 22:23 Erik Mackdanz
2018-12-15 21:41 Erik Mackdanz
2018-12-15 21:38 Erik Mackdanz
2018-11-11 21:23 Erik Mackdanz
2018-11-11 21:15 Erik Mackdanz
2018-11-04  4:03 Erik Mackdanz
2018-10-13 22:43 Erik Mackdanz
2018-08-19 22:23 Erik Mackdanz
2018-07-27  3:57 Erik Mackdanz
2018-07-27  3:52 Erik Mackdanz
2018-07-03 12:23 Virgil Dupras
2018-04-02  2:15 Erik Mackdanz
2018-04-02  2:12 Erik Mackdanz
2018-02-21  8:47 Agostino Sarubbo
2018-01-26 21:22 Patrice Clement
2018-01-05 19:21 Ulrich Müller
2017-09-24 11:18 Agostino Sarubbo
2017-09-21 12:41 Amy Liffey
2017-09-21 12:41 Amy Liffey
2017-09-02  9:32 Michał Górny
2017-08-14 21:41 Patrice Clement
2017-07-30 11:24 David Seifert
2017-04-14  8:25 Zac Medico
2016-10-04 12:11 Erik Mackdanz
2016-07-14  2:48 Erik Mackdanz
2016-03-18 19:11 Michał Górny
2015-08-10 21:06 Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1536533443.466f357db24e56349ca2f09e05a4b406087d62c0.stasibear@gentoo \
    --to=stasibear@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox