* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2015-09-05 21:49 Alex Brandt
0 siblings, 0 replies; 31+ messages in thread
From: Alex Brandt @ 2015-09-05 21:49 UTC (permalink / raw
To: gentoo-commits
commit: dc04154e0238085235132f4e4346d8934482ff8a
Author: Alex Brandt <alunduil <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 21:48:37 2015 +0000
Commit: Alex Brandt <alunduil <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 21:48:37 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc04154e
app-emulation/lxd: add version 0.16
submitted by Erik Mackdanz
Package-Manager: portage-2.2.20.1
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-0.16-dont-go-get.patch | 15 ++
.../lxd/files/lxd-0.16-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-0.16.confd | 23 +++
app-emulation/lxd/files/lxd-0.16.initd | 32 ++++
app-emulation/lxd/lxd-0.16.ebuild | 164 +++++++++++++++++++++
app-emulation/lxd/metadata.xml | 10 ++
7 files changed, 256 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 79b1749..6254714 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
DIST lxd-0.13.tar.bz2 3336161 SHA256 4228979ea9a856647f75f0230f58cc577c111a287f148787af766ab36c55f756 SHA512 12cd865ef63702674342df23ebb298b6ba39f0d44e9bfe91c643820be06ff30910145388a4daa2d63fbcb53c236e3cd4eb84e3e0bc617c85247322b0024c4920 WHIRLPOOL 82e788e9b35429df308d498955bd0cab06eb7d1a09c0a20bddad78490900b2cb78a44da9970db149ebfda546250a1d5aa2204e5f6f98b81a228310bfee3003a7
DIST lxd-0.14.tar.bz2 2526939 SHA256 c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512 d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e WHIRLPOOL 2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
+DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
diff --git a/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
new file mode 100644
index 0000000..fbfcf13
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig 2015-09-03 10:08:26.921410426 -0500
++++ Makefile 2015-09-03 10:08:52.193408698 -0500
+@@ -12,12 +12,10 @@
+
+ .PHONY: default
+ default:
+- go get -t -v -d ./... || true
+ go install -v ./...
+
+ .PHONY: client
+ client:
+- go get -t -v -d ./...
+ go install -v ./lxc
+
+ # This only needs to be done when migrate.proto is actually changed; since we
diff --git a/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
new file mode 100644
index 0000000..c81a3ed
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/migration/rsync.go.orig 2015-08-21 12:05:15.098768663 -0500
++++ lxd/migration/rsync.go 2015-08-21 12:06:15.899764506 -0500
+@@ -73,7 +73,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
+ if err := cmd.Start(); err != nil {
+ return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.16.confd b/app-emulation/lxd/files/lxd-0.16.confd
new file mode 100644
index 0000000..c3e6e68
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16.confd
@@ -0,0 +1,23 @@
+LXD_OPTIONS=""
+
+# Group which owns the shared socket
+LXD_OPTIONS="${LXD_OPTIONS} --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS="${LXD_OPTIONS} --cpuprofile ''"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS="${LXD_OPTIONS} --memprofile ''"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS="${LXD_OPTIONS} --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS="${LXD_OPTIONS} --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS="${LXD_OPTIONS} -v"
diff --git a/app-emulation/lxd/files/lxd-0.16.initd b/app-emulation/lxd/files/lxd-0.16.initd
new file mode 100644
index 0000000..2b75e51
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+ need cgmanager
+ need net
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxd server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.16.ebuild b/app-emulation/lxd/lxd-0.16.ebuild
new file mode 100644
index 0000000..cb20eba
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.16.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+criu +daemon +image +lvm nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ >=dev-lang/go-1.4.2:=
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ virtual/acl
+ criu? (
+ sys-process/criu
+ )
+ image? (
+ app-crypt/gnupg
+ >=dev-lang/python-3.2
+ )
+ lvm? (
+ sys-fs/lvm2
+ )
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ if use daemon; then
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+ fi
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ if use daemon; then
+ dobin bin/fuidshift
+
+ dosbin bin/lxd
+ fi
+
+ cd "src/${EGO_PN}"
+
+ use image && dobin scripts/lxd-images
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxc.in lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ if test -n "${REPLACING_VERSIONS}"; then
+ einfo
+ einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+ einfo "is no longer available in /etc/conf.d/lxd. Instead, configure the"
+ einfo "listen address/port by setting the core.https_address profile option."
+ fi
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 3ee6854..c49dbec 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -19,8 +19,18 @@
<remote-id type="github">lxc/lxd</remote-id>
</upstream>
<use>
+ <flag name="criu">
+ Add support for live-migrateable containers
+ </flag>
+ <flag name="daemon">
+ Build the system daemon, not just the client tool
+ </flag>
<flag name="image">
Installs the lxd-images image-fetching script
</flag>
+ <flag name="lvm">
+ Allow using the Logical Volume Manager as pool
+ for disk image storage
+ </flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2015-10-18 5:21 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2015-10-18 5:21 UTC (permalink / raw
To: gentoo-commits
commit: fa8dfda0c4145710b6906206db22236a7e1a4bae
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 05:19:43 2015 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 05:19:43 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8dfda0
app-emulation/lxd: bump to 0.20
Package-Manager: portage-2.2.23
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-0.20-dont-go-get.patch | 18 +++
.../lxd/files/lxd-0.20-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-0.20.confd | 27 ++++
app-emulation/lxd/files/lxd-0.20.initd | 32 ++++
app-emulation/lxd/lxd-0.20.ebuild | 169 +++++++++++++++++++++
app-emulation/lxd/metadata.xml | 6 +-
7 files changed, 259 insertions(+), 5 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 88f5361..6e1223b 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -2,3 +2,4 @@ DIST lxd-0.13.tar.bz2 3336161 SHA256 4228979ea9a856647f75f0230f58cc577c111a287f1
DIST lxd-0.14.tar.bz2 2526939 SHA256 c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512 d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e WHIRLPOOL 2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
DIST lxd-0.18.tar.bz2 2674919 SHA256 cb9c4823fb19ccef4827ee4dc3a105b60d3549b5023f4517d1471487469ea395 SHA512 5bbaae6eef27a0b14f8fee41d113afeea61de5414e5f7ed5011819eb6823a11dff647ac3f9781357304f7c5b04c618d05e4a04197cae6c6e4845cad5476d22ff WHIRLPOOL ca73e587f19491d79b03af2d205ab9f234b5acb1ff1f2d68a05be053cbd1ec89f6b9bc0fc64113980d7f2d6e3c7ece01d7d0c431c08a87b2b0ec555c6ff97914
+DIST lxd-0.20.tar.bz2 2687718 SHA256 a071b92015f676746137e1ffeab1886d90297d0d5832bbf5ee6aff081acc4840 SHA512 2064daa7d1aeb4764a15d559e3d4178918942d82dbba31e964d713aab48d2ee30ce6a63632701c41b13de4aea541acd76d55b52f12de10a99ffeaa3cb945ad44 WHIRLPOOL 1ffa9d6bf1cb7132b82e731002eae7b7ff3544fb03958827916c2e00e02a0bdd10bbadd2401f7799187c2c0338987f24b46d8e138131f7df888162e56b3f4fe5
diff --git a/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch
new file mode 100644
index 0000000..1b229ea
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
++++ Makefile 2015-09-17 20:53:27.715800926 -0500
+@@ -12,15 +12,11 @@
+
+ .PHONY: default
+ default:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./...
+ @echo "LXD built succesfuly"
+
+ .PHONY: client
+ client:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./lxc
+ @echo "LXD client built succesfuly"
+
diff --git a/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch
new file mode 100644
index 0000000..b88b7f7
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-09-17 21:00:29.290772099 -0500
++++ lxd/rsync.go 2015-09-17 21:00:54.737770359 -0500
+@@ -73,7 +73,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
+ if err := cmd.Start(); err != nil {
+ return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.20.confd b/app-emulation/lxd/files/lxd-0.20.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.20.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.20.initd b/app-emulation/lxd/files/lxd-0.20.initd
new file mode 100644
index 0000000..2b75e51
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.20.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+ need cgmanager
+ need net
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxd server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.20.ebuild b/app-emulation/lxd/lxd-0.20.ebuild
new file mode 100644
index 0000000..ab08cd1
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.20.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ >=dev-lang/go-1.4.2:=
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+# - integrate "lxd shutdown" into initscript as custom action (default "stop"
+# action should _not_ stop containers amirite?)
+# "Perform a clean shutdown of LXD and all running containers"
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ if use daemon; then
+ dobin bin/fuidshift
+
+ dosbin bin/lxd
+ fi
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxc.in lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+
+ if test -n "${REPLACING_VERSIONS}"; then
+ einfo
+ einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+ einfo "is no longer available in /etc/conf.d/lxd. Instead, configure the"
+ einfo "listen address/port by setting the core.https_address server option."
+ fi
+
+ einfo
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 46d6c90..263dcfe 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -2,13 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer status="active">
- <email>erikmack@gmail.com</email>
+ <email>stasibear@gentoo.org</email>
<name>Erik Mackdanz</name>
</maintainer>
- <maintainer>
- <email>alunduil@gentoo.org</email>
- <name>Alex Brandt</name>
- </maintainer>
<longdescription>
By combining the speed and density of containers with
the security of traditional virtual machines, LXD is
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2015-10-18 5:26 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2015-10-18 5:26 UTC (permalink / raw
To: gentoo-commits
commit: 197a5e9ff897b277927ad9fa005a8fbab783cd71
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 05:26:24 2015 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 05:26:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197a5e9f
app-emulation/lxd: remove old versions
Package-Manager: portage-2.2.23
app-emulation/lxd/Manifest | 2 -
.../lxd/files/lxd-0.13-nc-binary-name.patch | 11 --
.../lxd/files/lxd-0.14-nc-binary-name.patch | 11 --
app-emulation/lxd/files/lxd.confd | 26 ----
app-emulation/lxd/files/lxd.initd | 35 ------
app-emulation/lxd/lxd-0.13.ebuild | 136 --------------------
app-emulation/lxd/lxd-0.14.ebuild | 137 ---------------------
7 files changed, 358 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 6e1223b..12e2ace 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,5 +1,3 @@
-DIST lxd-0.13.tar.bz2 3336161 SHA256 4228979ea9a856647f75f0230f58cc577c111a287f148787af766ab36c55f756 SHA512 12cd865ef63702674342df23ebb298b6ba39f0d44e9bfe91c643820be06ff30910145388a4daa2d63fbcb53c236e3cd4eb84e3e0bc617c85247322b0024c4920 WHIRLPOOL 82e788e9b35429df308d498955bd0cab06eb7d1a09c0a20bddad78490900b2cb78a44da9970db149ebfda546250a1d5aa2204e5f6f98b81a228310bfee3003a7
-DIST lxd-0.14.tar.bz2 2526939 SHA256 c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512 d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e WHIRLPOOL 2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
DIST lxd-0.18.tar.bz2 2674919 SHA256 cb9c4823fb19ccef4827ee4dc3a105b60d3549b5023f4517d1471487469ea395 SHA512 5bbaae6eef27a0b14f8fee41d113afeea61de5414e5f7ed5011819eb6823a11dff647ac3f9781357304f7c5b04c618d05e4a04197cae6c6e4845cad5476d22ff WHIRLPOOL ca73e587f19491d79b03af2d205ab9f234b5acb1ff1f2d68a05be053cbd1ec89f6b9bc0fc64113980d7f2d6e3c7ece01d7d0c431c08a87b2b0ec555c6ff97914
DIST lxd-0.20.tar.bz2 2687718 SHA256 a071b92015f676746137e1ffeab1886d90297d0d5832bbf5ee6aff081acc4840 SHA512 2064daa7d1aeb4764a15d559e3d4178918942d82dbba31e964d713aab48d2ee30ce6a63632701c41b13de4aea541acd76d55b52f12de10a99ffeaa3cb945ad44 WHIRLPOOL 1ffa9d6bf1cb7132b82e731002eae7b7ff3544fb03958827916c2e00e02a0bdd10bbadd2401f7799187c2c0338987f24b46d8e138131f7df888162e56b3f4fe5
diff --git a/app-emulation/lxd/files/lxd-0.13-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.13-nc-binary-name.patch
deleted file mode 100644
index 40e1224..0000000
--- a/app-emulation/lxd/files/lxd-0.13-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/migration/rsync.go.orig 2015-07-11 09:33:18.012425011 -0500
-+++ lxd/migration/rsync.go 2015-07-11 09:33:34.881423857 -0500
-@@ -84,7 +84,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command("rsync", "-arvPz", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- if err := cmd.Start(); err != nil {
- return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.14-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.14-nc-binary-name.patch
deleted file mode 100644
index 40e1224..0000000
--- a/app-emulation/lxd/files/lxd-0.14-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/migration/rsync.go.orig 2015-07-11 09:33:18.012425011 -0500
-+++ lxd/migration/rsync.go 2015-07-11 09:33:34.881423857 -0500
-@@ -84,7 +84,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command("rsync", "-arvPz", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- if err := cmd.Start(); err != nil {
- return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd.confd b/app-emulation/lxd/files/lxd.confd
deleted file mode 100644
index 086198a..0000000
--- a/app-emulation/lxd/files/lxd.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-LXD_OPTIONS=""
-
-# Group which owns the shared socket
-LXD_OPTIONS="${LXD_OPTIONS} --group lxd"
-
-# TCP address <addr:port> to listen on in addition to the unix socket (e.g., 127.0.0.1:8443)
-#LXD_OPTIONS="${LXD_OPTIONS} --tcp 127.0.0.1:8443"
-
-
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS="${LXD_OPTIONS} --cpuprofile ''"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS="${LXD_OPTIONS} --memprofile ''"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS="${LXD_OPTIONS} --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS="${LXD_OPTIONS} --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS="${LXD_OPTIONS} -v"
diff --git a/app-emulation/lxd/files/lxd.initd b/app-emulation/lxd/files/lxd.initd
deleted file mode 100644
index fa72002..0000000
--- a/app-emulation/lxd/files/lxd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
- need cgmanager
-
- if echo "${LXD_OPTIONS}" | grep -e "--tcp" >/dev/null; then
- need net
- fi
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxd server"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/app-emulation/lxd/lxd-0.13.ebuild b/app-emulation/lxd/lxd-0.13.ebuild
deleted file mode 100644
index 0485a2f..0000000
--- a/app-emulation/lxd/lxd-0.13.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="nls test +image"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
- >=dev-lang/go-1.4.2:=
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager]
- net-analyzer/openbsd-netcat
- net-misc/bridge-utils
- virtual/acl
- image? (
- app-crypt/gnupg
- >=dev-lang/python-3.2
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}"
-
- # Build binaries
- GOPATH="${S}:$(get_golibdir_gopath)" emake
-
- use nls && emake build-mo
-}
-
-src_test() {
- # Go native tests should succeed
- golang-build_src_test
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
-
- dobin bin/fuidshift
- dobin bin/lxc
-
- dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- use image && dobin scripts/lxd-images
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- newinitd "${FILESDIR}"/lxd.initd lxd
- newconfd "${FILESDIR}"/lxd.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
-
- newbashcomp config/bash/lxc.in lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md
-
- docinto specs
- dodoc specs/*
-}
-
-pkg_config() {
- if brctl show lxcbr0 2>&1 | grep "No such device" >/dev/null; then
- brctl addbr lxcbr0
- fi
-}
-
-pkg_postinst() {
- # 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)
-
- # precedent: sys-libs/timezone-data
- pkg_config
-
- einfo
- einfo "To interact with the service as a non-root user, add yourself to the"
- einfo "lxd group. This requires you to log out and log in again."
- einfo
-}
diff --git a/app-emulation/lxd/lxd-0.14.ebuild b/app-emulation/lxd/lxd-0.14.ebuild
deleted file mode 100644
index d5f20f0..0000000
--- a/app-emulation/lxd/lxd-0.14.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="nls test +image"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
- dev-go/go-crypto
- >=dev-lang/go-1.4.2:=
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager]
- net-analyzer/openbsd-netcat
- net-misc/bridge-utils
- virtual/acl
- image? (
- app-crypt/gnupg
- >=dev-lang/python-3.2
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}"
-
- # Build binaries
- GOPATH="${S}:$(get_golibdir_gopath)" emake
-
- use nls && emake build-mo
-}
-
-src_test() {
- # Go native tests should succeed
- golang-build_src_test
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
-
- dobin bin/fuidshift
- dobin bin/lxc
-
- dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- use image && dobin scripts/lxd-images
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- newinitd "${FILESDIR}"/lxd.initd lxd
- newconfd "${FILESDIR}"/lxd.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
-
- newbashcomp config/bash/lxc.in lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md
-
- docinto specs
- dodoc specs/*
-}
-
-pkg_config() {
- if brctl show lxcbr0 2>&1 | grep "No such device" >/dev/null; then
- brctl addbr lxcbr0
- fi
-}
-
-pkg_postinst() {
- # 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)
-
- # precedent: sys-libs/timezone-data
- pkg_config
-
- einfo
- einfo "To interact with the service as a non-root user, add yourself to the"
- einfo "lxd group. This requires you to log out and log in again."
- einfo
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2015-11-12 15:56 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2015-11-12 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 66f68e3f3714d92799ca86f72c61ac75e39991fb
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 15:55:51 2015 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 15:55:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f68e3f
app-emulation/lxd: bump to 0.22
init script adds shutdown action (stop daemon + containers)
Package-Manager: portage-2.2.24
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-0.22-dont-go-get.patch | 18 +++
.../lxd/files/lxd-0.22-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-0.22.confd | 27 ++++
app-emulation/lxd/files/lxd-0.22.initd | 43 ++++++
app-emulation/lxd/lxd-0.22.ebuild | 157 +++++++++++++++++++++
6 files changed, 257 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 3a59603..493bbac 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.18.tar.bz2 2674919 SHA256 cb9c4823fb19ccef4827ee4dc3a105b60d3549b5023f4517d1471487469ea395 SHA512 5bbaae6eef27a0b14f8fee41d113afeea61de5414e5f7ed5011819eb6823a11dff647ac3f9781357304f7c5b04c618d05e4a04197cae6c6e4845cad5476d22ff WHIRLPOOL ca73e587f19491d79b03af2d205ab9f234b5acb1ff1f2d68a05be053cbd1ec89f6b9bc0fc64113980d7f2d6e3c7ece01d7d0c431c08a87b2b0ec555c6ff97914
DIST lxd-0.20.tar.bz2 2687718 SHA256 a071b92015f676746137e1ffeab1886d90297d0d5832bbf5ee6aff081acc4840 SHA512 2064daa7d1aeb4764a15d559e3d4178918942d82dbba31e964d713aab48d2ee30ce6a63632701c41b13de4aea541acd76d55b52f12de10a99ffeaa3cb945ad44 WHIRLPOOL 1ffa9d6bf1cb7132b82e731002eae7b7ff3544fb03958827916c2e00e02a0bdd10bbadd2401f7799187c2c0338987f24b46d8e138131f7df888162e56b3f4fe5
DIST lxd-0.21.tar.bz2 2683517 SHA256 06e9ed72d1d45af532664e47d9772a886dc1d757e83d673498b05798249c66c8 SHA512 588225ed77cd8a86b34579ee3f3b2b3ba8166ce9d85872e6076fa5075bc5a3846c82255dee6e701a6d51bdd9bf8280bbd5fab08ca4438de5320de8f0388685eb WHIRLPOOL c85f103e38f44c4cd859faf330764c3d076cede6d09f976b4686d7f91b6ca233e09721df418493fed19cb8bf3118b2a0a6723f3084da532bba4a5344de8a4b9c
+DIST lxd-0.22.tar.bz2 2685133 SHA256 66dc30b82fba7f606658280d0dbac67a32152644a403ab00285fc3907b50082e SHA512 ab5384143edd03dfa1ef956c64e9fce2d845ce07c5388f719c202fd1ff9059282e104400f39f23ff1c4fefc8a23dd1d4c6c9094b497c40c659b087989bf07d44 WHIRLPOOL 27559c50f6aa55edb533046bb49b04784c63003569e7920261504a7b4c69891a80ff8432421352c13f274bb21876f2cf5266e9de2b1302d69e0254be87c17137
diff --git a/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch
new file mode 100644
index 0000000..1b229ea
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
++++ Makefile 2015-09-17 20:53:27.715800926 -0500
+@@ -12,15 +12,11 @@
+
+ .PHONY: default
+ default:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./...
+ @echo "LXD built succesfuly"
+
+ .PHONY: client
+ client:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./lxc
+ @echo "LXD client built succesfuly"
+
diff --git a/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch
new file mode 100644
index 0000000..7373b66
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command(
+ "rsync",
+ "-arvP",
diff --git a/app-emulation/lxd/files/lxd-0.22.confd b/app-emulation/lxd/files/lxd-0.22.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.22.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.22.initd b/app-emulation/lxd/files/lxd-0.22.initd
new file mode 100644
index 0000000..65915f0
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.22.initd
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="shutdown"
+
+depend() {
+ need cgmanager
+ need net
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxd server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
+
+shutdown() {
+ ebegin "Stopping lxd server and containers"
+ if ${DAEMON} shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.22.ebuild b/app-emulation/lxd/lxd-0.22.ebuild
new file mode 100644
index 0000000..a56c9bd
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.22.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ >=dev-lang/go-1.4.2:=
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ if use daemon; then
+ dobin bin/fuidshift
+
+ dosbin bin/lxd
+ fi
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxc.in lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2015-11-27 18:05 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2015-11-27 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 4e637003aebf3cb9ae9db9cedcbb4ba5e96faa54
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 18:05:12 2015 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 18:05:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e637003
app-emulation/lxd: bump to 0.23
Package-Manager: portage-2.2.26
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-0.23-dont-go-get.patch | 18 +++
.../lxd/files/lxd-0.23-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-0.23.confd | 27 ++++
app-emulation/lxd/files/lxd-0.23.initd | 50 +++++++
app-emulation/lxd/lxd-0.23.ebuild | 157 +++++++++++++++++++++
6 files changed, 264 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index b8bca61..d8beda6 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.20.tar.bz2 2687718 SHA256 a071b92015f676746137e1ffeab1886d90297d0d5832bbf5ee6aff081acc4840 SHA512 2064daa7d1aeb4764a15d559e3d4178918942d82dbba31e964d713aab48d2ee30ce6a63632701c41b13de4aea541acd76d55b52f12de10a99ffeaa3cb945ad44 WHIRLPOOL 1ffa9d6bf1cb7132b82e731002eae7b7ff3544fb03958827916c2e00e02a0bdd10bbadd2401f7799187c2c0338987f24b46d8e138131f7df888162e56b3f4fe5
DIST lxd-0.21.tar.bz2 2683517 SHA256 06e9ed72d1d45af532664e47d9772a886dc1d757e83d673498b05798249c66c8 SHA512 588225ed77cd8a86b34579ee3f3b2b3ba8166ce9d85872e6076fa5075bc5a3846c82255dee6e701a6d51bdd9bf8280bbd5fab08ca4438de5320de8f0388685eb WHIRLPOOL c85f103e38f44c4cd859faf330764c3d076cede6d09f976b4686d7f91b6ca233e09721df418493fed19cb8bf3118b2a0a6723f3084da532bba4a5344de8a4b9c
DIST lxd-0.22.tar.bz2 2685133 SHA256 66dc30b82fba7f606658280d0dbac67a32152644a403ab00285fc3907b50082e SHA512 ab5384143edd03dfa1ef956c64e9fce2d845ce07c5388f719c202fd1ff9059282e104400f39f23ff1c4fefc8a23dd1d4c6c9094b497c40c659b087989bf07d44 WHIRLPOOL 27559c50f6aa55edb533046bb49b04784c63003569e7920261504a7b4c69891a80ff8432421352c13f274bb21876f2cf5266e9de2b1302d69e0254be87c17137
+DIST lxd-0.23.tar.bz2 2606330 SHA256 06335bd15b00db2dec06114427b1d934fe1ac5271b85eb19074c508cb2466695 SHA512 2f73817c800c55c722a3017ee3064587c04730d5da9846b44be99b4541e739b466bcb7e924fcb18a15f1d49d010d471510378060530f6a15f6e60363b4d556b3 WHIRLPOOL 455b782ed2d21d5a720e06e356e1dd2115df174893e66710c74d02596deb8a66ff6e77b400f2ebeb047209b3bfed0927ff21a3a9f7cf9924719b84742f0eb5a7
diff --git a/app-emulation/lxd/files/lxd-0.23-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.23-dont-go-get.patch
new file mode 100644
index 0000000..1b229ea
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.23-dont-go-get.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
++++ Makefile 2015-09-17 20:53:27.715800926 -0500
+@@ -12,15 +12,11 @@
+
+ .PHONY: default
+ default:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./...
+ @echo "LXD built succesfuly"
+
+ .PHONY: client
+ client:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./lxc
+ @echo "LXD client built succesfuly"
+
diff --git a/app-emulation/lxd/files/lxd-0.23-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.23-nc-binary-name.patch
new file mode 100644
index 0000000..7373b66
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.23-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command(
+ "rsync",
+ "-arvP",
diff --git a/app-emulation/lxd/files/lxd-0.23.confd b/app-emulation/lxd/files/lxd-0.23.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.23.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.23.initd b/app-emulation/lxd/files/lxd-0.23.initd
new file mode 100644
index 0000000..c5ba3a6
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.23.initd
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="shutdown"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ shutdown
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+shutdown() {
+ ebegin "Stopping lxd service and containers"
+ if ${DAEMON} shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.23.ebuild b/app-emulation/lxd/lxd-0.23.ebuild
new file mode 100644
index 0000000..549dff5
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.23.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxc.in lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2015-12-12 5:41 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2015-12-12 5:41 UTC (permalink / raw
To: gentoo-commits
commit: e20a0904091b13d7b69d5f87475d924c57639ac8
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 05:42:01 2015 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 05:42:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20a0904
app-emulation/lxd: remove old
Package-Manager: portage-2.2.26
app-emulation/lxd/Manifest | 2 -
app-emulation/lxd/files/lxd-0.20-dont-go-get.patch | 18 ---
.../lxd/files/lxd-0.20-nc-binary-name.patch | 11 --
app-emulation/lxd/files/lxd-0.20.confd | 27 ----
app-emulation/lxd/files/lxd-0.20.initd | 32 ----
app-emulation/lxd/files/lxd-0.21-dont-go-get.patch | 18 ---
.../lxd/files/lxd-0.21-nc-binary-name.patch | 11 --
app-emulation/lxd/files/lxd-0.21.confd | 27 ----
app-emulation/lxd/files/lxd-0.21.initd | 32 ----
app-emulation/lxd/lxd-0.20.ebuild | 169 ---------------------
app-emulation/lxd/lxd-0.21.ebuild | 169 ---------------------
11 files changed, 516 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 9581399..43dc501 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,5 +1,3 @@
-DIST lxd-0.20.tar.bz2 2687718 SHA256 a071b92015f676746137e1ffeab1886d90297d0d5832bbf5ee6aff081acc4840 SHA512 2064daa7d1aeb4764a15d559e3d4178918942d82dbba31e964d713aab48d2ee30ce6a63632701c41b13de4aea541acd76d55b52f12de10a99ffeaa3cb945ad44 WHIRLPOOL 1ffa9d6bf1cb7132b82e731002eae7b7ff3544fb03958827916c2e00e02a0bdd10bbadd2401f7799187c2c0338987f24b46d8e138131f7df888162e56b3f4fe5
-DIST lxd-0.21.tar.bz2 2683517 SHA256 06e9ed72d1d45af532664e47d9772a886dc1d757e83d673498b05798249c66c8 SHA512 588225ed77cd8a86b34579ee3f3b2b3ba8166ce9d85872e6076fa5075bc5a3846c82255dee6e701a6d51bdd9bf8280bbd5fab08ca4438de5320de8f0388685eb WHIRLPOOL c85f103e38f44c4cd859faf330764c3d076cede6d09f976b4686d7f91b6ca233e09721df418493fed19cb8bf3118b2a0a6723f3084da532bba4a5344de8a4b9c
DIST lxd-0.22.tar.bz2 2685133 SHA256 66dc30b82fba7f606658280d0dbac67a32152644a403ab00285fc3907b50082e SHA512 ab5384143edd03dfa1ef956c64e9fce2d845ce07c5388f719c202fd1ff9059282e104400f39f23ff1c4fefc8a23dd1d4c6c9094b497c40c659b087989bf07d44 WHIRLPOOL 27559c50f6aa55edb533046bb49b04784c63003569e7920261504a7b4c69891a80ff8432421352c13f274bb21876f2cf5266e9de2b1302d69e0254be87c17137
DIST lxd-0.23.tar.bz2 2606330 SHA256 06335bd15b00db2dec06114427b1d934fe1ac5271b85eb19074c508cb2466695 SHA512 2f73817c800c55c722a3017ee3064587c04730d5da9846b44be99b4541e739b466bcb7e924fcb18a15f1d49d010d471510378060530f6a15f6e60363b4d556b3 WHIRLPOOL 455b782ed2d21d5a720e06e356e1dd2115df174893e66710c74d02596deb8a66ff6e77b400f2ebeb047209b3bfed0927ff21a3a9f7cf9924719b84742f0eb5a7
DIST lxd-0.24.tar.bz2 1973022 SHA256 e3851bded0f2639e4aec9c63797135bfa3b27def17123c8e506c784b1ab4c99a SHA512 e7593136fd1fb13542a8415d964ff3bab8bcc7f7a7d806874e7c21fd9d96652aa5716a9d3318cea3d849a19aa96b40bfea27f4edd528c8307efaeeac88971f2e WHIRLPOOL 69b6722a25c9e75e533436a37951dc893cbf3d3c0f5d31b3ccc2cf0a7dede9cf16c53e68562348ab9bf9e621421030b826df21e5fb32df8a496127601fa5d898
diff --git a/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch
deleted file mode 100644
index 1b229ea..0000000
--- a/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
-+++ Makefile 2015-09-17 20:53:27.715800926 -0500
-@@ -12,15 +12,11 @@
-
- .PHONY: default
- default:
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v ./...
- @echo "LXD built succesfuly"
-
- .PHONY: client
- client:
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v ./lxc
- @echo "LXD client built succesfuly"
-
diff --git a/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch
deleted file mode 100644
index b88b7f7..0000000
--- a/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig 2015-09-17 21:00:29.290772099 -0500
-+++ lxd/rsync.go 2015-09-17 21:00:54.737770359 -0500
-@@ -73,7 +73,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- if err := cmd.Start(); err != nil {
- return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.20.confd b/app-emulation/lxd/files/lxd-0.20.confd
deleted file mode 100644
index 3d55327..0000000
--- a/app-emulation/lxd/files/lxd-0.20.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.20.initd b/app-emulation/lxd/files/lxd-0.20.initd
deleted file mode 100644
index 2b75e51..0000000
--- a/app-emulation/lxd/files/lxd-0.20.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
- need cgmanager
- need net
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxd server"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch
deleted file mode 100644
index 1b229ea..0000000
--- a/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
-+++ Makefile 2015-09-17 20:53:27.715800926 -0500
-@@ -12,15 +12,11 @@
-
- .PHONY: default
- default:
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v ./...
- @echo "LXD built succesfuly"
-
- .PHONY: client
- client:
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v ./lxc
- @echo "LXD client built succesfuly"
-
diff --git a/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch
deleted file mode 100644
index b88b7f7..0000000
--- a/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig 2015-09-17 21:00:29.290772099 -0500
-+++ lxd/rsync.go 2015-09-17 21:00:54.737770359 -0500
-@@ -73,7 +73,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- if err := cmd.Start(); err != nil {
- return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.21.confd b/app-emulation/lxd/files/lxd-0.21.confd
deleted file mode 100644
index 3d55327..0000000
--- a/app-emulation/lxd/files/lxd-0.21.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.21.initd b/app-emulation/lxd/files/lxd-0.21.initd
deleted file mode 100644
index 2b75e51..0000000
--- a/app-emulation/lxd/files/lxd-0.21.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
- need cgmanager
- need net
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxd server"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/app-emulation/lxd/lxd-0.20.ebuild b/app-emulation/lxd/lxd-0.20.ebuild
deleted file mode 100644
index ab08cd1..0000000
--- a/app-emulation/lxd/lxd-0.20.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
- dev-go/go-crypto
- >=dev-lang/go-1.4.2:=
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-analyzer/openbsd-netcat
- net-misc/bridge-utils
- net-misc/rsync[xattr]
- sys-apps/iproute2
- virtual/acl
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
-# be preferable for that support to go into the golang-build eclass not
-# this package directly.
-# - integrate "lxd shutdown" into initscript as custom action (default "stop"
-# action should _not_ stop containers amirite?)
-# "Perform a clean shutdown of LXD and all running containers"
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}"
-
- epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}"
-
- if use daemon; then
- # Build binaries
- GOPATH="${S}:$(get_golibdir_gopath)" emake
- else
- # build client tool
- GOPATH="${S}:$(get_golibdir_gopath)" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- if use daemon; then
- dobin bin/fuidshift
-
- dosbin bin/lxd
- fi
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxc.in lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md
-
- docinto specs
- dodoc specs/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-
- if test -n "${REPLACING_VERSIONS}"; then
- einfo
- einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
- einfo "is no longer available in /etc/conf.d/lxd. Instead, configure the"
- einfo "listen address/port by setting the core.https_address server option."
- fi
-
- einfo
-}
diff --git a/app-emulation/lxd/lxd-0.21.ebuild b/app-emulation/lxd/lxd-0.21.ebuild
deleted file mode 100644
index dd67b7b..0000000
--- a/app-emulation/lxd/lxd-0.21.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
- dev-go/go-crypto
- >=dev-lang/go-1.4.2:=
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-analyzer/openbsd-netcat
- net-misc/bridge-utils
- net-misc/rsync[xattr]
- sys-apps/iproute2
- virtual/acl
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
-# be preferable for that support to go into the golang-build eclass not
-# this package directly.
-# - integrate "lxd shutdown" into initscript as custom action (default "stop"
-# action should _not_ stop containers amirite?)
-# "Perform a clean shutdown of LXD and all running containers"
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}"
-
- epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}"
-
- if use daemon; then
- # Build binaries
- GOPATH="${S}:$(get_golibdir_gopath)" emake
- else
- # build client tool
- GOPATH="${S}:$(get_golibdir_gopath)" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- if use daemon; then
- dobin bin/fuidshift
-
- dosbin bin/lxd
- fi
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxc.in lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md
-
- docinto specs
- dodoc specs/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-
- if test -n "${REPLACING_VERSIONS}"; then
- einfo
- einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
- einfo "is no longer available in /etc/conf.d/lxd. Instead, configure the"
- einfo "listen address/port by setting the core.https_address server option."
- fi
-
- einfo
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-01-25 0:07 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-01-25 0:07 UTC (permalink / raw
To: gentoo-commits
commit: 8e819fd7ae98168a28cfb9adfc759a13a13e195e
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 00:07:18 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 00:07:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e819fd7
app-emulation/lxd: bump to 0.27
Package-Manager: portage-2.2.26
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-0.27-dont-go-get.patch | 20 +++
.../lxd/files/lxd-0.27-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-0.27.confd | 27 ++++
app-emulation/lxd/files/lxd-0.27.initd | 50 +++++++
app-emulation/lxd/lxd-0.27.ebuild | 157 +++++++++++++++++++++
6 files changed, 266 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 6711b5b..8a6cfa6 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.24.tar.bz2 1973022 SHA256 e3851bded0f2639e4aec9c63797135bfa3b27def17123c8e506c784b1ab4c99a SHA512 e7593136fd1fb13542a8415d964ff3bab8bcc7f7a7d806874e7c21fd9d96652aa5716a9d3318cea3d849a19aa96b40bfea27f4edd528c8307efaeeac88971f2e WHIRLPOOL 69b6722a25c9e75e533436a37951dc893cbf3d3c0f5d31b3ccc2cf0a7dede9cf16c53e68562348ab9bf9e621421030b826df21e5fb32df8a496127601fa5d898
DIST lxd-0.25.tar.bz2 1983043 SHA256 1cfdf1a5e8638060e2368e9e5cf8763406857309f08c4668fa0756e85ba7b89e SHA512 001e52826a3bbe00121115ddace14b3f552321f16e97700763ff6dd23b5babd3c1393cbc9b9b263b6a18c31e49c30d612e3d7153d4987644689989be0be50d00 WHIRLPOOL 496f3f19c50c1ee79ba8b5625cf34b6f57683f4066a09b3edc2cbd017cc5ebc2cc7ac9e569c94bcba0d699c6efb722b79ae43541e0dfddc2fb8d877131519b06
DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e
+DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589
diff --git a/app-emulation/lxd/files/lxd-0.27-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.27-dont-go-get.patch
new file mode 100644
index 0000000..9964af6
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.27-dont-go-get.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig 2015-12-28 19:23:28.425122306 -0600
++++ Makefile 2015-12-28 19:25:09.482123654 -0600
+@@ -12,17 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./...
+ @echo "LXD built succesfuly"
+
+ .PHONY: client
+ client:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./lxc
+ @echo "LXD client built succesfuly"
+
diff --git a/app-emulation/lxd/files/lxd-0.27-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.27-nc-binary-name.patch
new file mode 100644
index 0000000..7373b66
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.27-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command(
+ "rsync",
+ "-arvP",
diff --git a/app-emulation/lxd/files/lxd-0.27.confd b/app-emulation/lxd/files/lxd-0.27.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.27.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.27.initd b/app-emulation/lxd/files/lxd-0.27.initd
new file mode 100644
index 0000000..ec23258
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.27.initd
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.27.ebuild b/app-emulation/lxd/lxd-0.27.ebuild
new file mode 100644
index 0000000..ba679e3
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.27.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-02-03 23:53 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-02-03 23:53 UTC (permalink / raw
To: gentoo-commits
commit: fcd3f868b93b6e707841fdce724155795071e1cd
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 23:53:43 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 23:53:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd3f868
app-emulation/lxd: bump to 2.0.0_beta1
Package-Manager: portage-2.2.27
app-emulation/lxd/Manifest | 1 +
.../lxd-2.0.0_beta1-disregard-dev-subdirs.patch | 17 +++
.../lxd/files/lxd-2.0.0_beta1-dont-go-get.patch | 20 +++
.../lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-2.0.0_beta1.confd | 27 ++++
app-emulation/lxd/files/lxd-2.0.0_beta1.initd | 50 +++++++
app-emulation/lxd/lxd-2.0.0_beta1.ebuild | 165 +++++++++++++++++++++
7 files changed, 291 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index fcb60cb..c887cbd 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.25.tar.bz2 1983043 SHA256 1cfdf1a5e8638060e2368e9e5cf8763406857309f08c4668fa0756e85ba7b89e SHA512 001e52826a3bbe00121115ddace14b3f552321f16e97700763ff6dd23b5babd3c1393cbc9b9b263b6a18c31e49c30d612e3d7153d4987644689989be0be50d00 WHIRLPOOL 496f3f19c50c1ee79ba8b5625cf34b6f57683f4066a09b3edc2cbd017cc5ebc2cc7ac9e569c94bcba0d699c6efb722b79ae43541e0dfddc2fb8d877131519b06
DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e
DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589
+DIST lxd-2.0.0_beta1.tar.bz2 2253384 SHA256 443d8004aea80a9295eeb28c81b930947163b5af5e7c5ec15e6123938268bd6c SHA512 21cc90e18173f832f7aa2f39762ba1c47ac54dbb947519302075d10f8c55cce766d436cb7f9ec96cb2fe538952b801398ce3b1320d878e8835d58e4fb3b81c86 WHIRLPOOL 85a11976fbf74f8b408c75aa7abf645d3e27eed3f82021fbcb7b2d8db95cc986fdf2cd6a38ef8749857027b380382e66678fb1f1656274159dbc2531c3860761
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch
new file mode 100644
index 0000000..9655e5e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch
@@ -0,0 +1,17 @@
+--- a/lxd/container_lxc.go
++++ b/lxd/container_lxc.go
+@@ -3509,8 +3509,13 @@ func (c *containerLXC) getDiskLimits() (map[string]deviceBlockLimit, error) {
+
+ for _, block := range blocks {
+ dev := strings.TrimPrefix(block, "/dev/")
++
++ if strings.Contains(dev,"/") {
++ continue
++ }
++
+ if !shared.PathExists(fmt.Sprintf("/sys/class/block/%s/dev", dev)) {
+- return nil, fmt.Errorf("Disk is missing /sys/class/block entry")
++ return nil, fmt.Errorf("Disk %s is missing /sys/class/block entry", dev)
+ }
+
+ block, err := ioutil.ReadFile(fmt.Sprintf("/sys/class/block/%s/dev", dev))
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch
new file mode 100644
index 0000000..9964af6
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig 2015-12-28 19:23:28.425122306 -0600
++++ Makefile 2015-12-28 19:25:09.482123654 -0600
+@@ -12,17 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./...
+ @echo "LXD built succesfuly"
+
+ .PHONY: client
+ client:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./lxc
+ @echo "LXD client built succesfuly"
+
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch
new file mode 100644
index 0000000..7373b66
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command(
+ "rsync",
+ "-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1.confd b/app-emulation/lxd/files/lxd-2.0.0_beta1.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta1.initd b/app-emulation/lxd/files/lxd-2.0.0_beta1.initd
new file mode 100644
index 0000000..ec23258
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta1.initd
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-2.0.0_beta1.ebuild b/app-emulation/lxd/lxd-2.0.0_beta1.ebuild
new file mode 100644
index 0000000..9ff9d90
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.0.0_beta1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ # see https://github.com/lxc/lxd/pull/1562
+ epatch "${FILESDIR}/${P}-disregard-dev-subdirs.patch"
+
+ tmpgoroot="${T}/goroot"
+ mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+ cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:${tmpgoroot}" emake
+ else
+ # build client tool
+ GOPATH="${S}:${tmpgoroot}" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-02-19 3:12 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-02-19 3:12 UTC (permalink / raw
To: gentoo-commits
commit: 590f0288cf5613f3d2cec07d41bac83f6894bf1a
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 03:12:29 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 03:13:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590f0288
app-emulation/lxd: bump to 2.0.0_beta3
Package-Manager: portage-2.2.27
app-emulation/lxd/Manifest | 1 +
.../lxd/files/lxd-2.0.0_beta3-dont-go-get.patch | 20 +++
.../lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-2.0.0_beta3.confd | 27 ++++
app-emulation/lxd/files/lxd-2.0.0_beta3.initd | 50 +++++++
app-emulation/lxd/lxd-2.0.0_beta3.ebuild | 162 +++++++++++++++++++++
6 files changed, 271 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index d68b9fb..961359e 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e
DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589
DIST lxd-2.0.0_beta1.tar.bz2 2253384 SHA256 443d8004aea80a9295eeb28c81b930947163b5af5e7c5ec15e6123938268bd6c SHA512 21cc90e18173f832f7aa2f39762ba1c47ac54dbb947519302075d10f8c55cce766d436cb7f9ec96cb2fe538952b801398ce3b1320d878e8835d58e4fb3b81c86 WHIRLPOOL 85a11976fbf74f8b408c75aa7abf645d3e27eed3f82021fbcb7b2d8db95cc986fdf2cd6a38ef8749857027b380382e66678fb1f1656274159dbc2531c3860761
+DIST lxd-2.0.0_beta3.tar.bz2 2283443 SHA256 a3bdf6c081ebed01fcd1ae92a6d3ebf2e7d6ffea606fe3cb83559366e7dc90aa SHA512 3f80c1236ac9a92a350b4221478dd69eb2693672d73859738b691b9462155d0a907de90deab9950980500ab0faa5ec815bc6191cedf2d34d3757757f585570ec WHIRLPOOL 6d425c26ef37bc65871cf08946f0a80e5b9a3e01da5edd07605e94a2b418e6d2163ee90210c4439350000c35a18efa97102dcbab90ccd1577d6164b5b2e271b4
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch
new file mode 100644
index 0000000..d2e622e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig 2016-02-19 00:16:40.720102639 +0000
++++ Makefile 2016-02-19 00:18:10.886096473 +0000
+@@ -12,17 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch
new file mode 100644
index 0000000..7373b66
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command(
+ "rsync",
+ "-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3.confd b/app-emulation/lxd/files/lxd-2.0.0_beta3.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta3.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3.initd b/app-emulation/lxd/files/lxd-2.0.0_beta3.initd
new file mode 100644
index 0000000..ec23258
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta3.initd
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-2.0.0_beta3.ebuild b/app-emulation/lxd/lxd-2.0.0_beta3.ebuild
new file mode 100644
index 0000000..f57f3fb
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.0.0_beta3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ tmpgoroot="${T}/goroot"
+ mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+ cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:${tmpgoroot}" emake
+ else
+ # build client tool
+ GOPATH="${S}:${tmpgoroot}" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-02-20 14:37 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-02-20 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 05546cbcaafe79f8e90bf4cda89e0800e49a138f
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 03:15:45 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 14:37:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05546cbc
app-emulation/lxd: remove old
Package-Manager: portage-2.2.27
app-emulation/lxd/Manifest | 1 -
app-emulation/lxd/files/lxd-0.26-dont-go-get.patch | 20 ---
.../lxd/files/lxd-0.26-nc-binary-name.patch | 11 --
app-emulation/lxd/files/lxd-0.26.confd | 27 ----
app-emulation/lxd/files/lxd-0.26.initd | 50 -------
app-emulation/lxd/lxd-0.26.ebuild | 157 ---------------------
6 files changed, 266 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 961359e..ebd047c 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,4 +1,3 @@
-DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e
DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589
DIST lxd-2.0.0_beta1.tar.bz2 2253384 SHA256 443d8004aea80a9295eeb28c81b930947163b5af5e7c5ec15e6123938268bd6c SHA512 21cc90e18173f832f7aa2f39762ba1c47ac54dbb947519302075d10f8c55cce766d436cb7f9ec96cb2fe538952b801398ce3b1320d878e8835d58e4fb3b81c86 WHIRLPOOL 85a11976fbf74f8b408c75aa7abf645d3e27eed3f82021fbcb7b2d8db95cc986fdf2cd6a38ef8749857027b380382e66678fb1f1656274159dbc2531c3860761
DIST lxd-2.0.0_beta3.tar.bz2 2283443 SHA256 a3bdf6c081ebed01fcd1ae92a6d3ebf2e7d6ffea606fe3cb83559366e7dc90aa SHA512 3f80c1236ac9a92a350b4221478dd69eb2693672d73859738b691b9462155d0a907de90deab9950980500ab0faa5ec815bc6191cedf2d34d3757757f585570ec WHIRLPOOL 6d425c26ef37bc65871cf08946f0a80e5b9a3e01da5edd07605e94a2b418e6d2163ee90210c4439350000c35a18efa97102dcbab90ccd1577d6164b5b2e271b4
diff --git a/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch
deleted file mode 100644
index 9964af6..0000000
--- a/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig 2015-12-28 19:23:28.425122306 -0600
-+++ Makefile 2015-12-28 19:25:09.482123654 -0600
-@@ -12,17 +12,11 @@
-
- .PHONY: default
- default:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v ./...
- @echo "LXD built succesfuly"
-
- .PHONY: client
- client:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v ./lxc
- @echo "LXD client built succesfuly"
-
diff --git a/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch
deleted file mode 100644
index 7373b66..0000000
--- a/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
-+++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
-@@ -91,7 +91,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command(
- "rsync",
- "-arvP",
diff --git a/app-emulation/lxd/files/lxd-0.26.confd b/app-emulation/lxd/files/lxd-0.26.confd
deleted file mode 100644
index 3d55327..0000000
--- a/app-emulation/lxd/files/lxd-0.26.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.26.initd b/app-emulation/lxd/files/lxd-0.26.initd
deleted file mode 100644
index ec23258..0000000
--- a/app-emulation/lxd/files/lxd-0.26.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/lxd-0.26.ebuild b/app-emulation/lxd/lxd-0.26.ebuild
deleted file mode 100644
index ce16642..0000000
--- a/app-emulation/lxd/lxd-0.26.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-# The compiler is forced in golang-base:
-# DEPEND=">=dev-lang/go-1.4.2:="
-# ... so the dep is omitted here (and I disagree with := in this case)
-
-DEPEND="
- dev-go/go-crypto
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-analyzer/openbsd-netcat
- net-misc/bridge-utils
- net-misc/rsync[xattr]
- sys-apps/iproute2
- virtual/acl
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
-# be preferable for that support to go into the golang-build eclass not
-# this package directly.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- if use daemon; then
- # Build binaries
- GOPATH="${S}:$(get_golibdir_gopath)" emake
- else
- # build client tool
- GOPATH="${S}:$(get_golibdir_gopath)" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxc.in lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md
-
- docinto specs
- dodoc specs/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-02-28 18:03 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-02-28 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 1ab37655cd44110d0d910168d9ba7b80115c3759
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 18:03:18 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 18:04:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab37655
app-emulation/lxd: Version bump to beta 4
Removes dep on bridge-utils (uses iproute2 instead)
Package-Manager: portage-2.2.27
app-emulation/lxd/Manifest | 1 +
.../lxd/files/lxd-2.0.0_beta4-dont-go-get.patch | 20 +++
.../lxd/files/lxd-2.0.0_beta4-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-2.0.0_beta4.confd | 27 ++++
app-emulation/lxd/files/lxd-2.0.0_beta4.initd | 50 +++++++
app-emulation/lxd/lxd-2.0.0_beta4.ebuild | 161 +++++++++++++++++++++
6 files changed, 270 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index ebd047c..c39da3c 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589
DIST lxd-2.0.0_beta1.tar.bz2 2253384 SHA256 443d8004aea80a9295eeb28c81b930947163b5af5e7c5ec15e6123938268bd6c SHA512 21cc90e18173f832f7aa2f39762ba1c47ac54dbb947519302075d10f8c55cce766d436cb7f9ec96cb2fe538952b801398ce3b1320d878e8835d58e4fb3b81c86 WHIRLPOOL 85a11976fbf74f8b408c75aa7abf645d3e27eed3f82021fbcb7b2d8db95cc986fdf2cd6a38ef8749857027b380382e66678fb1f1656274159dbc2531c3860761
DIST lxd-2.0.0_beta3.tar.bz2 2283443 SHA256 a3bdf6c081ebed01fcd1ae92a6d3ebf2e7d6ffea606fe3cb83559366e7dc90aa SHA512 3f80c1236ac9a92a350b4221478dd69eb2693672d73859738b691b9462155d0a907de90deab9950980500ab0faa5ec815bc6191cedf2d34d3757757f585570ec WHIRLPOOL 6d425c26ef37bc65871cf08946f0a80e5b9a3e01da5edd07605e94a2b418e6d2163ee90210c4439350000c35a18efa97102dcbab90ccd1577d6164b5b2e271b4
+DIST lxd-2.0.0_beta4.tar.bz2 2291955 SHA256 6487750275e21ab3e862ea56807b9fcf28e9a646040e1f50f3967e9f76cf27e5 SHA512 ae67b9098946f037c1c938cc46f141fb8089ae33b980dd55cebc9cc3f14fbcd645e810e185fdc61dacbd6437569d079e4d9bd9763d12fefb65cfcecf13c10b28 WHIRLPOOL 6c781b47b80d044128647567b6de81352b174e2224e9ff91f2e1eacc5dfbb9141e53aa74e9bce479ebee1bb6c691282849897c34f815415623abcf3d666c7033
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta4-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta4-dont-go-get.patch
new file mode 100644
index 0000000..d2e622e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta4-dont-go-get.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig 2016-02-19 00:16:40.720102639 +0000
++++ Makefile 2016-02-19 00:18:10.886096473 +0000
+@@ -12,17 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta4-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta4-nc-binary-name.patch
new file mode 100644
index 0000000..7373b66
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta4-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command(
+ "rsync",
+ "-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta4.confd b/app-emulation/lxd/files/lxd-2.0.0_beta4.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta4.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta4.initd b/app-emulation/lxd/files/lxd-2.0.0_beta4.initd
new file mode 100644
index 0000000..ec23258
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_beta4.initd
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-2.0.0_beta4.ebuild b/app-emulation/lxd/lxd-2.0.0_beta4.ebuild
new file mode 100644
index 0000000..ac54e47
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.0.0_beta4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ tmpgoroot="${T}/goroot"
+ mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+ cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:${tmpgoroot}" emake
+ else
+ # build client tool
+ GOPATH="${S}:${tmpgoroot}" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-03-08 9:43 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-03-08 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 4703eb07d3c02233ee6272c9cf4a82770a812ac9
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 8 09:44:12 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Tue Mar 8 09:44:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4703eb07
app-emulation/lxd: bump to 2.0.0_rc2
Package-Manager: portage-2.2.27
app-emulation/lxd/Manifest | 1 +
.../lxd/files/lxd-2.0.0_rc2-dont-go-get.patch | 20 +++
.../lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-2.0.0_rc2.confd | 27 ++++
app-emulation/lxd/files/lxd-2.0.0_rc2.initd | 50 +++++++
app-emulation/lxd/lxd-2.0.0_rc2.ebuild | 161 +++++++++++++++++++++
6 files changed, 270 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 206d24f..b5b721a 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-2.0.0_beta1.tar.bz2 2253384 SHA256 443d8004aea80a9295eeb28c81b930947163b5af5e7c5ec15e6123938268bd6c SHA512 21cc90e18173f832f7aa2f39762ba1c47ac54dbb947519302075d10f8c55cce766d436cb7f9ec96cb2fe538952b801398ce3b1320d878e8835d58e4fb3b81c86 WHIRLPOOL 85a11976fbf74f8b408c75aa7abf645d3e27eed3f82021fbcb7b2d8db95cc986fdf2cd6a38ef8749857027b380382e66678fb1f1656274159dbc2531c3860761
DIST lxd-2.0.0_beta3.tar.bz2 2283443 SHA256 a3bdf6c081ebed01fcd1ae92a6d3ebf2e7d6ffea606fe3cb83559366e7dc90aa SHA512 3f80c1236ac9a92a350b4221478dd69eb2693672d73859738b691b9462155d0a907de90deab9950980500ab0faa5ec815bc6191cedf2d34d3757757f585570ec WHIRLPOOL 6d425c26ef37bc65871cf08946f0a80e5b9a3e01da5edd07605e94a2b418e6d2163ee90210c4439350000c35a18efa97102dcbab90ccd1577d6164b5b2e271b4
DIST lxd-2.0.0_beta4.tar.bz2 2291955 SHA256 6487750275e21ab3e862ea56807b9fcf28e9a646040e1f50f3967e9f76cf27e5 SHA512 ae67b9098946f037c1c938cc46f141fb8089ae33b980dd55cebc9cc3f14fbcd645e810e185fdc61dacbd6437569d079e4d9bd9763d12fefb65cfcecf13c10b28 WHIRLPOOL 6c781b47b80d044128647567b6de81352b174e2224e9ff91f2e1eacc5dfbb9141e53aa74e9bce479ebee1bb6c691282849897c34f815415623abcf3d666c7033
+DIST lxd-2.0.0_rc2.tar.bz2 2306077 SHA256 d74babbd5c537430a574a13c0f70c7633affc9bbd0e21bf0039872bdfb801fe9 SHA512 6a21620e19277293a3b665d4061f5aa9443d1a9a5ab88fa885096ff77acf828b215e247136bb99ea1ba230f015181bc9a86a919664c9288577509a2146a5aa66 WHIRLPOOL f88e0f3b5ecd9803bc8baee864ffbdf33b39f331a5e5ceb170b2792d2e26b6f4faae3a8cc6aae090e81accd3835408f2956a117095bc790ca7c16cd7f21d205e
diff --git a/app-emulation/lxd/files/lxd-2.0.0_rc2-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_rc2-dont-go-get.patch
new file mode 100644
index 0000000..d2e622e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_rc2-dont-go-get.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig 2016-02-19 00:16:40.720102639 +0000
++++ Makefile 2016-02-19 00:18:10.886096473 +0000
+@@ -12,17 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch
new file mode 100644
index 0000000..7373b66
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command(
+ "rsync",
+ "-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0_rc2.confd b/app-emulation/lxd/files/lxd-2.0.0_rc2.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_rc2.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0_rc2.initd b/app-emulation/lxd/files/lxd-2.0.0_rc2.initd
new file mode 100644
index 0000000..ec23258
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.0_rc2.initd
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-2.0.0_rc2.ebuild b/app-emulation/lxd/lxd-2.0.0_rc2.ebuild
new file mode 100644
index 0000000..ac54e47
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.0.0_rc2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+# The compiler is forced in golang-base:
+# DEPEND=">=dev-lang/go-1.4.2:="
+# ... so the dep is omitted here (and I disagree with := in this case)
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ tmpgoroot="${T}/goroot"
+ mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+ cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:${tmpgoroot}" emake
+ else
+ # build client tool
+ GOPATH="${S}:${tmpgoroot}" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-04-14 3:46 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-04-14 3:46 UTC (permalink / raw
To: gentoo-commits
commit: 949fe8e9691e717b6dab344017eb3e82a096c74b
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 03:47:36 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 03:47:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949fe8e9
app-emulation/lxd: remove old
Package-Manager: portage-2.2.28
app-emulation/lxd/Manifest | 1 -
.../lxd/files/lxd-2.0.0_beta3-dont-go-get.patch | 20 ---
.../lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch | 11 --
app-emulation/lxd/files/lxd-2.0.0_beta3.confd | 27 ----
app-emulation/lxd/files/lxd-2.0.0_beta3.initd | 50 -------
app-emulation/lxd/lxd-2.0.0_beta3.ebuild | 162 ---------------------
6 files changed, 271 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 9007c24..2f42ca7 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,4 +1,3 @@
DIST lxd-2.0.0.tar.bz2 2305314 SHA256 da5bab198cff8bee4528f35537221a252b4b2a23d655921aabbf281b0fd2ec6a SHA512 23e791403f81951c9e5227b804fb400d80dde56f17ff71d511be4514943bd4bac7f4ade738294a4a88d9c4f73e4302f6c5b0e22eb245083fb1eeee6e01e207c4 WHIRLPOOL 72b1dc86547a8d0db74eca5e07fd33bf0545c1dbafba894a6316e77d36673fef5b765df68b4d6cd39d2db9a1dacfb757696ec982023aed329e38201aef1a5562
-DIST lxd-2.0.0_beta3.tar.bz2 2283443 SHA256 a3bdf6c081ebed01fcd1ae92a6d3ebf2e7d6ffea606fe3cb83559366e7dc90aa SHA512 3f80c1236ac9a92a350b4221478dd69eb2693672d73859738b691b9462155d0a907de90deab9950980500ab0faa5ec815bc6191cedf2d34d3757757f585570ec WHIRLPOOL 6d425c26ef37bc65871cf08946f0a80e5b9a3e01da5edd07605e94a2b418e6d2163ee90210c4439350000c35a18efa97102dcbab90ccd1577d6164b5b2e271b4
DIST lxd-2.0.0_beta4.tar.bz2 2291955 SHA256 6487750275e21ab3e862ea56807b9fcf28e9a646040e1f50f3967e9f76cf27e5 SHA512 ae67b9098946f037c1c938cc46f141fb8089ae33b980dd55cebc9cc3f14fbcd645e810e185fdc61dacbd6437569d079e4d9bd9763d12fefb65cfcecf13c10b28 WHIRLPOOL 6c781b47b80d044128647567b6de81352b174e2224e9ff91f2e1eacc5dfbb9141e53aa74e9bce479ebee1bb6c691282849897c34f815415623abcf3d666c7033
DIST lxd-2.0.0_rc2.tar.bz2 2306077 SHA256 d74babbd5c537430a574a13c0f70c7633affc9bbd0e21bf0039872bdfb801fe9 SHA512 6a21620e19277293a3b665d4061f5aa9443d1a9a5ab88fa885096ff77acf828b215e247136bb99ea1ba230f015181bc9a86a919664c9288577509a2146a5aa66 WHIRLPOOL f88e0f3b5ecd9803bc8baee864ffbdf33b39f331a5e5ceb170b2792d2e26b6f4faae3a8cc6aae090e81accd3835408f2956a117095bc790ca7c16cd7f21d205e
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch
deleted file mode 100644
index d2e622e..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig 2016-02-19 00:16:40.720102639 +0000
-+++ Makefile 2016-02-19 00:18:10.886096473 +0000
-@@ -12,17 +12,11 @@
-
- .PHONY: default
- default:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch
deleted file mode 100644
index 7373b66..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
-+++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
-@@ -91,7 +91,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command(
- "rsync",
- "-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3.confd b/app-emulation/lxd/files/lxd-2.0.0_beta3.confd
deleted file mode 100644
index 3d55327..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_beta3.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3.initd b/app-emulation/lxd/files/lxd-2.0.0_beta3.initd
deleted file mode 100644
index ec23258..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_beta3.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/lxd-2.0.0_beta3.ebuild b/app-emulation/lxd/lxd-2.0.0_beta3.ebuild
deleted file mode 100644
index f57f3fb..0000000
--- a/app-emulation/lxd/lxd-2.0.0_beta3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-# The compiler is forced in golang-base:
-# DEPEND=">=dev-lang/go-1.4.2:="
-# ... so the dep is omitted here (and I disagree with := in this case)
-
-DEPEND="
- dev-go/go-crypto
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-analyzer/openbsd-netcat
- net-misc/bridge-utils
- net-misc/rsync[xattr]
- sys-apps/iproute2
- virtual/acl
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
-# be preferable for that support to go into the golang-build eclass not
-# this package directly.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- tmpgoroot="${T}/goroot"
- mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
- cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- GOPATH="${S}:${tmpgoroot}" emake
- else
- # build client tool
- GOPATH="${S}:${tmpgoroot}" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md
-
- docinto specs
- dodoc specs/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-06-13 15:42 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-06-13 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 1c437fe99eb4beb6b279b843587c5c559ce452ad
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 15:40:41 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 15:41:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c437fe9
app-emulation/lxd: bump to 2.0.2
Address CVE-2016-1581 and CVE-2016-1582
Package-Manager: portage-2.3.0_rc1
app-emulation/lxd/Manifest | 1 +
.../lxd/files/lxd-2.0.2-dont-go-get.patch | 20 +++
app-emulation/lxd/files/lxd-2.0.2.confd | 27 ++++
app-emulation/lxd/files/lxd-2.0.2.initd | 50 +++++++
app-emulation/lxd/lxd-2.0.2.ebuild | 149 +++++++++++++++++++++
5 files changed, 247 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 8297025..072650a 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -2,3 +2,4 @@ DIST lxd-2.0.0.tar.bz2 2305314 SHA256 da5bab198cff8bee4528f35537221a252b4b2a23d6
DIST lxd-2.0.0_beta4.tar.bz2 2291955 SHA256 6487750275e21ab3e862ea56807b9fcf28e9a646040e1f50f3967e9f76cf27e5 SHA512 ae67b9098946f037c1c938cc46f141fb8089ae33b980dd55cebc9cc3f14fbcd645e810e185fdc61dacbd6437569d079e4d9bd9763d12fefb65cfcecf13c10b28 WHIRLPOOL 6c781b47b80d044128647567b6de81352b174e2224e9ff91f2e1eacc5dfbb9141e53aa74e9bce479ebee1bb6c691282849897c34f815415623abcf3d666c7033
DIST lxd-2.0.0_rc2.tar.bz2 2306077 SHA256 d74babbd5c537430a574a13c0f70c7633affc9bbd0e21bf0039872bdfb801fe9 SHA512 6a21620e19277293a3b665d4061f5aa9443d1a9a5ab88fa885096ff77acf828b215e247136bb99ea1ba230f015181bc9a86a919664c9288577509a2146a5aa66 WHIRLPOOL f88e0f3b5ecd9803bc8baee864ffbdf33b39f331a5e5ceb170b2792d2e26b6f4faae3a8cc6aae090e81accd3835408f2956a117095bc790ca7c16cd7f21d205e
DIST lxd-2.0.1.tar.bz2 2330217 SHA256 b9a315825bfc66469a442f3b3da73e2af97dba270ffe1bc18c871cd6c1c7ad69 SHA512 67b1c42a0957bd2f4963c860372211dbbc38cb8e9346e83c6319749efd9e1a188c00033865901d285650298531460b9f54cba0e88d0973179c0c17bcd30cc97d WHIRLPOOL 4ae640fc6410dff9d08816a6ac7ddb47a4cce9dfbbfaa65baf8456517aca25a501b0e680d9a6855a0fa3b9efe8cd1eddb0a9981d43de9ef573c16be936f5104a
+DIST lxd-2.0.2.tar.bz2 2340565 SHA256 0054b0e79ba0bc1a1189eb63ca8ac2ca2bafd10c500ce53f67abbd5abc03b542 SHA512 c79f1c7f0aeb289ba7bea745917aaac0d339baf0e6b4fe62cbcb67b8da072ef135e971d4c17546e2e208aeae921ad2853073493f9e7a6e300876bd72b808e516 WHIRLPOOL a30bddfc79ad0c7d941db811f1942fff67afc79a217a251d55b1cf37d80cdb21f8f1f72df268382cbcd34d408005ef4185f5bd59f95369b51558938352f05c60
diff --git a/app-emulation/lxd/files/lxd-2.0.2-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.2-dont-go-get.patch
new file mode 100644
index 0000000..d2e622e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.2-dont-go-get.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig 2016-02-19 00:16:40.720102639 +0000
++++ Makefile 2016-02-19 00:18:10.886096473 +0000
+@@ -12,17 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- # Must run twice due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.0.2.confd b/app-emulation/lxd/files/lxd-2.0.2.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.2.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.2.initd b/app-emulation/lxd/files/lxd-2.0.2.initd
new file mode 100644
index 0000000..c1aef37
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.2.initd
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-2.0.2.ebuild b/app-emulation/lxd/lxd-2.0.2.ebuild
new file mode 100644
index 0000000..fdb143b
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.0.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ tmpgoroot="${T}/goroot"
+ mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+ cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:${tmpgoroot}" emake
+ else
+ # build client tool
+ GOPATH="${S}:${tmpgoroot}" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-07-12 23:54 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-07-12 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 42357c55b8c39c4b8b763b03e8f51b089e82590f
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 23:54:19 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 23:54:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42357c55
app-emulation/lxd: Bump to 2.0.3
EAPI=6
Package-Manager: portage-2.3.0
app-emulation/lxd/Manifest | 1 +
.../lxd/files/lxd-2.0.3-dont-go-get.patch | 22 +++
app-emulation/lxd/files/lxd-2.0.3.confd | 27 ++++
app-emulation/lxd/files/lxd-2.0.3.initd | 50 +++++++
app-emulation/lxd/lxd-2.0.3.ebuild | 155 +++++++++++++++++++++
5 files changed, 255 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 072650a..8abc29c 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -3,3 +3,4 @@ DIST lxd-2.0.0_beta4.tar.bz2 2291955 SHA256 6487750275e21ab3e862ea56807b9fcf28e9
DIST lxd-2.0.0_rc2.tar.bz2 2306077 SHA256 d74babbd5c537430a574a13c0f70c7633affc9bbd0e21bf0039872bdfb801fe9 SHA512 6a21620e19277293a3b665d4061f5aa9443d1a9a5ab88fa885096ff77acf828b215e247136bb99ea1ba230f015181bc9a86a919664c9288577509a2146a5aa66 WHIRLPOOL f88e0f3b5ecd9803bc8baee864ffbdf33b39f331a5e5ceb170b2792d2e26b6f4faae3a8cc6aae090e81accd3835408f2956a117095bc790ca7c16cd7f21d205e
DIST lxd-2.0.1.tar.bz2 2330217 SHA256 b9a315825bfc66469a442f3b3da73e2af97dba270ffe1bc18c871cd6c1c7ad69 SHA512 67b1c42a0957bd2f4963c860372211dbbc38cb8e9346e83c6319749efd9e1a188c00033865901d285650298531460b9f54cba0e88d0973179c0c17bcd30cc97d WHIRLPOOL 4ae640fc6410dff9d08816a6ac7ddb47a4cce9dfbbfaa65baf8456517aca25a501b0e680d9a6855a0fa3b9efe8cd1eddb0a9981d43de9ef573c16be936f5104a
DIST lxd-2.0.2.tar.bz2 2340565 SHA256 0054b0e79ba0bc1a1189eb63ca8ac2ca2bafd10c500ce53f67abbd5abc03b542 SHA512 c79f1c7f0aeb289ba7bea745917aaac0d339baf0e6b4fe62cbcb67b8da072ef135e971d4c17546e2e208aeae921ad2853073493f9e7a6e300876bd72b808e516 WHIRLPOOL a30bddfc79ad0c7d941db811f1942fff67afc79a217a251d55b1cf37d80cdb21f8f1f72df268382cbcd34d408005ef4185f5bd59f95369b51558938352f05c60
+DIST lxd-2.0.3.tar.bz2 2349842 SHA256 fb8a56e08da776f5210970a12e61b2e7b751328b5628e6fbebde231952b907a9 SHA512 62ac76bee0ff151343d0686da9376ff16965af5de19b50055bad86461dc2dd8e06544ee39640537f8352ec03b584ed32cf70cce9c7c961285d9ea567c617330e WHIRLPOOL 60204498c0a104310ddb28e42ea8889830c2f0e8c830c683b51d5cdbc92380de7c7964961fc7a34b32c7cb4dccaa4222f017b0d8948f54d5044770c066141319
diff --git a/app-emulation/lxd/files/lxd-2.0.3-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.3-dont-go-get.patch
new file mode 100644
index 0000000..9402de5
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.3-dont-go-get.patch
@@ -0,0 +1,22 @@
+--- /Makefile.orig 2016-07-11 23:34:40.299664675 +0000
++++ /Makefile 2016-07-11 23:37:00.816018727 +0000
+@@ -12,19 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must a few times due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- # Must a few times due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.0.3.confd b/app-emulation/lxd/files/lxd-2.0.3.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.3.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.3.initd b/app-emulation/lxd/files/lxd-2.0.3.initd
new file mode 100644
index 0000000..c1aef37
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.0.3.initd
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-2.0.3.ebuild b/app-emulation/lxd/lxd-2.0.3.ebuild
new file mode 100644
index 0000000..e45469a
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.0.3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# The source is repackaged using a script at:
+# https://dev.gentoo.org/~stasibear/lxd_repackage.py
+# This is necessary because go's native package management assumes
+# that a build starts with checking out many git repositories, often
+# from HEAD. This provides no way to build the same code repeatably,
+# and anyway portage requires that fetching is only done from SRC_URI.
+# The only sane alternative I've seen is in the consul ebuild, which
+# is more transparent but raises other questions.
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ default_src_prepare
+
+ tmpgoroot="${T}/goroot"
+ mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+ cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:${tmpgoroot}" emake
+ else
+ # build client tool
+ GOPATH="${S}:${tmpgoroot}" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-07-12 23:57 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-07-12 23:57 UTC (permalink / raw
To: gentoo-commits
commit: 2f09fd2da0d64039c063fbf05a2e51b8d15c363c
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 23:57:50 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 23:57:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f09fd2d
app-emulation/lxd: Remove old versions
Package-Manager: portage-2.3.0
app-emulation/lxd/Manifest | 3 -
.../lxd/files/lxd-2.0.0-dont-go-get.patch | 20 ---
.../lxd/files/lxd-2.0.0-nc-binary-name.patch | 11 --
app-emulation/lxd/files/lxd-2.0.0.confd | 27 ----
app-emulation/lxd/files/lxd-2.0.0.initd | 50 -------
.../lxd/files/lxd-2.0.0_beta4-dont-go-get.patch | 20 ---
.../lxd/files/lxd-2.0.0_beta4-nc-binary-name.patch | 11 --
app-emulation/lxd/files/lxd-2.0.0_beta4.confd | 27 ----
app-emulation/lxd/files/lxd-2.0.0_beta4.initd | 50 -------
.../lxd/files/lxd-2.0.0_rc2-dont-go-get.patch | 20 ---
.../lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch | 11 --
app-emulation/lxd/files/lxd-2.0.0_rc2.confd | 27 ----
app-emulation/lxd/files/lxd-2.0.0_rc2.initd | 50 -------
app-emulation/lxd/lxd-2.0.0.ebuild | 158 --------------------
app-emulation/lxd/lxd-2.0.0_beta4.ebuild | 161 ---------------------
app-emulation/lxd/lxd-2.0.0_rc2.ebuild | 161 ---------------------
16 files changed, 807 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 8abc29c..5d37b24 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,6 +1,3 @@
-DIST lxd-2.0.0.tar.bz2 2305314 SHA256 da5bab198cff8bee4528f35537221a252b4b2a23d655921aabbf281b0fd2ec6a SHA512 23e791403f81951c9e5227b804fb400d80dde56f17ff71d511be4514943bd4bac7f4ade738294a4a88d9c4f73e4302f6c5b0e22eb245083fb1eeee6e01e207c4 WHIRLPOOL 72b1dc86547a8d0db74eca5e07fd33bf0545c1dbafba894a6316e77d36673fef5b765df68b4d6cd39d2db9a1dacfb757696ec982023aed329e38201aef1a5562
-DIST lxd-2.0.0_beta4.tar.bz2 2291955 SHA256 6487750275e21ab3e862ea56807b9fcf28e9a646040e1f50f3967e9f76cf27e5 SHA512 ae67b9098946f037c1c938cc46f141fb8089ae33b980dd55cebc9cc3f14fbcd645e810e185fdc61dacbd6437569d079e4d9bd9763d12fefb65cfcecf13c10b28 WHIRLPOOL 6c781b47b80d044128647567b6de81352b174e2224e9ff91f2e1eacc5dfbb9141e53aa74e9bce479ebee1bb6c691282849897c34f815415623abcf3d666c7033
-DIST lxd-2.0.0_rc2.tar.bz2 2306077 SHA256 d74babbd5c537430a574a13c0f70c7633affc9bbd0e21bf0039872bdfb801fe9 SHA512 6a21620e19277293a3b665d4061f5aa9443d1a9a5ab88fa885096ff77acf828b215e247136bb99ea1ba230f015181bc9a86a919664c9288577509a2146a5aa66 WHIRLPOOL f88e0f3b5ecd9803bc8baee864ffbdf33b39f331a5e5ceb170b2792d2e26b6f4faae3a8cc6aae090e81accd3835408f2956a117095bc790ca7c16cd7f21d205e
DIST lxd-2.0.1.tar.bz2 2330217 SHA256 b9a315825bfc66469a442f3b3da73e2af97dba270ffe1bc18c871cd6c1c7ad69 SHA512 67b1c42a0957bd2f4963c860372211dbbc38cb8e9346e83c6319749efd9e1a188c00033865901d285650298531460b9f54cba0e88d0973179c0c17bcd30cc97d WHIRLPOOL 4ae640fc6410dff9d08816a6ac7ddb47a4cce9dfbbfaa65baf8456517aca25a501b0e680d9a6855a0fa3b9efe8cd1eddb0a9981d43de9ef573c16be936f5104a
DIST lxd-2.0.2.tar.bz2 2340565 SHA256 0054b0e79ba0bc1a1189eb63ca8ac2ca2bafd10c500ce53f67abbd5abc03b542 SHA512 c79f1c7f0aeb289ba7bea745917aaac0d339baf0e6b4fe62cbcb67b8da072ef135e971d4c17546e2e208aeae921ad2853073493f9e7a6e300876bd72b808e516 WHIRLPOOL a30bddfc79ad0c7d941db811f1942fff67afc79a217a251d55b1cf37d80cdb21f8f1f72df268382cbcd34d408005ef4185f5bd59f95369b51558938352f05c60
DIST lxd-2.0.3.tar.bz2 2349842 SHA256 fb8a56e08da776f5210970a12e61b2e7b751328b5628e6fbebde231952b907a9 SHA512 62ac76bee0ff151343d0686da9376ff16965af5de19b50055bad86461dc2dd8e06544ee39640537f8352ec03b584ed32cf70cce9c7c961285d9ea567c617330e WHIRLPOOL 60204498c0a104310ddb28e42ea8889830c2f0e8c830c683b51d5cdbc92380de7c7964961fc7a34b32c7cb4dccaa4222f017b0d8948f54d5044770c066141319
diff --git a/app-emulation/lxd/files/lxd-2.0.0-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0-dont-go-get.patch
deleted file mode 100644
index d2e622e..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0-dont-go-get.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig 2016-02-19 00:16:40.720102639 +0000
-+++ Makefile 2016-02-19 00:18:10.886096473 +0000
-@@ -12,17 +12,11 @@
-
- .PHONY: default
- default:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.0.0-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0-nc-binary-name.patch
deleted file mode 100644
index f28bb6a..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig 2016-04-14 01:12:39.290529683 +0000
-+++ lxd/rsync.go 2016-04-14 01:13:20.991526832 +0000
-@@ -93,7 +93,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command(
- "rsync",
- "-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0.confd b/app-emulation/lxd/files/lxd-2.0.0.confd
deleted file mode 100644
index 3d55327..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0.initd b/app-emulation/lxd/files/lxd-2.0.0.initd
deleted file mode 100644
index 0ff13c8..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta4-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta4-dont-go-get.patch
deleted file mode 100644
index d2e622e..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_beta4-dont-go-get.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig 2016-02-19 00:16:40.720102639 +0000
-+++ Makefile 2016-02-19 00:18:10.886096473 +0000
-@@ -12,17 +12,11 @@
-
- .PHONY: default
- default:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta4-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta4-nc-binary-name.patch
deleted file mode 100644
index 7373b66..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_beta4-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
-+++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
-@@ -91,7 +91,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command(
- "rsync",
- "-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta4.confd b/app-emulation/lxd/files/lxd-2.0.0_beta4.confd
deleted file mode 100644
index 3d55327..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_beta4.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta4.initd b/app-emulation/lxd/files/lxd-2.0.0_beta4.initd
deleted file mode 100644
index 0ff13c8..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_beta4.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-2.0.0_rc2-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_rc2-dont-go-get.patch
deleted file mode 100644
index d2e622e..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_rc2-dont-go-get.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig 2016-02-19 00:16:40.720102639 +0000
-+++ Makefile 2016-02-19 00:18:10.886096473 +0000
-@@ -12,17 +12,11 @@
-
- .PHONY: default
- default:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- # Must run twice due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch
deleted file mode 100644
index 7373b66..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
-+++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
-@@ -91,7 +91,7 @@
- * command (i.e. the command to run on --server). However, we're
- * hardcoding that at the other end, so we can just ignore it.
- */
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- cmd := exec.Command(
- "rsync",
- "-arvP",
diff --git a/app-emulation/lxd/files/lxd-2.0.0_rc2.confd b/app-emulation/lxd/files/lxd-2.0.0_rc2.confd
deleted file mode 100644
index 3d55327..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_rc2.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.0.0_rc2.initd b/app-emulation/lxd/files/lxd-2.0.0_rc2.initd
deleted file mode 100644
index 0ff13c8..0000000
--- a/app-emulation/lxd/files/lxd-2.0.0_rc2.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/lxd-2.0.0.ebuild b/app-emulation/lxd/lxd-2.0.0.ebuild
deleted file mode 100644
index 0bb91b4..0000000
--- a/app-emulation/lxd/lxd-2.0.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-# The compiler is forced in golang-base:
-# DEPEND=">=dev-lang/go-1.4.2:="
-# ... so the dep is omitted here (and I disagree with := in this case)
-
-DEPEND="
- dev-go/go-crypto
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-analyzer/openbsd-netcat
- net-misc/rsync[xattr]
- sys-apps/iproute2
- virtual/acl
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
-# be preferable for that support to go into the golang-build eclass not
-# this package directly.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- tmpgoroot="${T}/goroot"
- mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
- cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- GOPATH="${S}:${tmpgoroot}" emake
- else
- # build client tool
- GOPATH="${S}:${tmpgoroot}" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md doc/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-}
diff --git a/app-emulation/lxd/lxd-2.0.0_beta4.ebuild b/app-emulation/lxd/lxd-2.0.0_beta4.ebuild
deleted file mode 100644
index ac54e47..0000000
--- a/app-emulation/lxd/lxd-2.0.0_beta4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-# The compiler is forced in golang-base:
-# DEPEND=">=dev-lang/go-1.4.2:="
-# ... so the dep is omitted here (and I disagree with := in this case)
-
-DEPEND="
- dev-go/go-crypto
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-analyzer/openbsd-netcat
- net-misc/rsync[xattr]
- sys-apps/iproute2
- virtual/acl
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
-# be preferable for that support to go into the golang-build eclass not
-# this package directly.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- tmpgoroot="${T}/goroot"
- mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
- cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- GOPATH="${S}:${tmpgoroot}" emake
- else
- # build client tool
- GOPATH="${S}:${tmpgoroot}" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md
-
- docinto specs
- dodoc specs/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-}
diff --git a/app-emulation/lxd/lxd-2.0.0_rc2.ebuild b/app-emulation/lxd/lxd-2.0.0_rc2.ebuild
deleted file mode 100644
index ac54e47..0000000
--- a/app-emulation/lxd/lxd-2.0.0_rc2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-# The compiler is forced in golang-base:
-# DEPEND=">=dev-lang/go-1.4.2:="
-# ... so the dep is omitted here (and I disagree with := in this case)
-
-DEPEND="
- dev-go/go-crypto
- dev-libs/protobuf
- dev-vcs/git
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-analyzer/openbsd-netcat
- net-misc/rsync[xattr]
- sys-apps/iproute2
- virtual/acl
- )
-"
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
-# be preferable for that support to go into the golang-build eclass not
-# this package directly.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
- # Upstream requires the openbsd flavor of netcat (with -U), but
- # Gentoo installs that with a renamed binary
- epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
- tmpgoroot="${T}/goroot"
- mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
- cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- GOPATH="${S}:${tmpgoroot}" emake
- else
- # build client tool
- GOPATH="${S}:${tmpgoroot}" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md
-
- docinto specs
- dodoc specs/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-09-15 3:13 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-09-15 3:13 UTC (permalink / raw
To: gentoo-commits
commit: 621335bae4060c15aeebab33b1503964cfcb190d
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 03:12:43 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 03:12:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621335ba
app-emulation/lxd: bump to 2.2
Package-Manager: portage-2.3.0
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-2.2-dont-go-get.patch | 22 +++
app-emulation/lxd/files/lxd-2.2.confd | 27 ++++
app-emulation/lxd/files/lxd-2.2.initd | 50 +++++++
app-emulation/lxd/lxd-2.2.ebuild | 156 ++++++++++++++++++++++
5 files changed, 256 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 55bbeca..99d98b2 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
DIST lxd-2.0.3.tar.bz2 2349842 SHA256 fb8a56e08da776f5210970a12e61b2e7b751328b5628e6fbebde231952b907a9 SHA512 62ac76bee0ff151343d0686da9376ff16965af5de19b50055bad86461dc2dd8e06544ee39640537f8352ec03b584ed32cf70cce9c7c961285d9ea567c617330e WHIRLPOOL 60204498c0a104310ddb28e42ea8889830c2f0e8c830c683b51d5cdbc92380de7c7964961fc7a34b32c7cb4dccaa4222f017b0d8948f54d5044770c066141319
DIST lxd-2.1.tar.bz2 2260663 SHA256 6513d0576c8579668e480c4a663ffda9c3788b7d72338dbd443567a2da0d52d2 SHA512 4da46c256035253a7c0447cfc3f6887116b99f7bb4757b2b54dba436107a56dbab5973c654ea5c39760fac6b590ee9eb99ecc81b357b37a212990b25b9fa9ee9 WHIRLPOOL 90256881584a8b1d8ebe6d774a3d5614a634be06bbc0e0a51284ea842e590a21b8fc9b1eb228cca65b45306ed9750e10c81847663d2b6676ba192870aa8569a7
+DIST lxd-2.2.tar.bz2 2234844 SHA256 c76b8698a9266afa5e4aec3ccaa283226cc52232e10ad376f02c4bcd000126b7 SHA512 272cd02f8533a18a51739fd2698f239cd57ae852fbf828d3dc53ed1253629808984720bde9173ae7df1f9e94389ab929b53893e7b57c2d0f6571744365c1c93a WHIRLPOOL d76c5ed9bedde8d51403a452bfc1f33bcb19d71fca79439c63f2b70bd58544ff0c05f4008f2603935dd1c63c4d0ea5c733775c723330de692fc5f6cd471d1529
diff --git a/app-emulation/lxd/files/lxd-2.2-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.2-dont-go-get.patch
new file mode 100644
index 00000000..9402de5
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.2-dont-go-get.patch
@@ -0,0 +1,22 @@
+--- /Makefile.orig 2016-07-11 23:34:40.299664675 +0000
++++ /Makefile 2016-07-11 23:37:00.816018727 +0000
+@@ -12,19 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must a few times due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- # Must a few times due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.2.confd b/app-emulation/lxd/files/lxd-2.2.confd
new file mode 100644
index 00000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.2.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.2.initd b/app-emulation/lxd/files/lxd-2.2.initd
new file mode 100644
index 00000000..c1aef37
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.2.initd
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-2.2.ebuild b/app-emulation/lxd/lxd-2.2.ebuild
new file mode 100644
index 00000000..b5754f1
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# The source is repackaged using a script at:
+# https://dev.gentoo.org/~stasibear/lxd_repackage.py
+# This is necessary because go's native package management assumes
+# that a build starts with checking out many git repositories, often
+# from HEAD. This provides no way to build the same code repeatably,
+# and anyway portage requires that fetching is only done from SRC_URI.
+# The only sane alternative I've seen is in the consul ebuild, which
+# is more transparent but raises other questions.
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ dev-libs/protobuf
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ sys-fs/squashfs-tools
+ virtual/acl
+ )
+"
+
+PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ default_src_prepare
+
+ tmpgoroot="${T}/goroot"
+ mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+ cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:${tmpgoroot}" emake
+ else
+ # build client tool
+ GOPATH="${S}:${tmpgoroot}" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2016-10-29 4:32 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2016-10-29 4:32 UTC (permalink / raw
To: gentoo-commits
commit: eb97b372e9bf98e02c65c797a4a8b6ab2291c6c0
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 04:32:13 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 04:32:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb97b372
app-emulation/lxd: Bump to 2.5
Package-Manager: portage-2.3.2
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-2.5-dont-go-get.patch | 22 +++
app-emulation/lxd/files/lxd-2.5.confd | 27 +++
app-emulation/lxd/files/lxd-2.5.initd | 50 ++++++
app-emulation/lxd/lxd-2.5.ebuild | 195 ++++++++++++++++++++++
5 files changed, 295 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 20f1f79..cb63251 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-2.2.tar.bz2 2234844 SHA256 c76b8698a9266afa5e4aec3ccaa283226cc52232e10ad376f02c4bcd000126b7 SHA512 272cd02f8533a18a51739fd2698f239cd57ae852fbf828d3dc53ed1253629808984720bde9173ae7df1f9e94389ab929b53893e7b57c2d0f6571744365c1c93a WHIRLPOOL d76c5ed9bedde8d51403a452bfc1f33bcb19d71fca79439c63f2b70bd58544ff0c05f4008f2603935dd1c63c4d0ea5c733775c723330de692fc5f6cd471d1529
DIST lxd-2.3.tar.bz2 2248758 SHA256 cd746b3f9682e50b7973e6175a5b48b999748face9e4b515491773ade9d754c4 SHA512 746ea9c2e9266a8482a62fc9e9fdb83f0713b0094e1b52957c5bf2fbd00f4bf1d7a0978086ab123d60ac02bd0dd1f00d46801959ced3b01308170dd7911c7bdc WHIRLPOOL f899e78bd3082ddd46dab5d09d83fe23a23aabbee09488f48ef2ff4a9f3bc41878ecb50b4223235c12962b01468c7b0124c0ae54e60d452f224824cbc89d144e
DIST lxd-2.4.1.tar.bz2 2257768 SHA256 4a02c74819870be5df71227f90be4bc1b7cb90784c115c9f96a6174c8d4dcf75 SHA512 84ce4911a55d495f809a4174061577eceba0b3cd0381170a23fea91651049e43ec809494bf885b315b2d5fde7cda19ee29eed71259b88d3a789fd87c26aac3db WHIRLPOOL 70a2eb3c6b239e9d8682005134ae5c8e991b2f331685b971e1e8d09173aec8c34848527c9f893af0f937384d0f33f7a9e626f8063a00e2fa450331acf00ad7fe
+DIST lxd-2.5.tar.bz2 2267313 SHA256 d87ac77ec6f47cd3e3417a78b0c315dac367bc89c532cf1784d80b31e57cfc8d SHA512 c023f2b9ccd958560eead23806cb60a04371a3721420f5c0d65e55cf2d7647d6690677619c4f8fa91573545817a1444d9d61f6a2b6ca8c3870136911cb1fbce9 WHIRLPOOL e4702e2597c5fe88ffa5139b829146ea474959799910bed79db617d9486da73d9de77c1ad398c1112d04109a858e5684f2c676bfe9fd4d68cf5081fbc0f6ae7a
diff --git a/app-emulation/lxd/files/lxd-2.5-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.5-dont-go-get.patch
new file mode 100644
index 00000000..9402de5
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.5-dont-go-get.patch
@@ -0,0 +1,22 @@
+--- /Makefile.orig 2016-07-11 23:34:40.299664675 +0000
++++ /Makefile 2016-07-11 23:37:00.816018727 +0000
+@@ -12,19 +12,11 @@
+
+ .PHONY: default
+ default:
+- # Must a few times due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- # Must a few times due to go get race
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.5.confd b/app-emulation/lxd/files/lxd-2.5.confd
new file mode 100644
index 00000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.5.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.5.initd b/app-emulation/lxd/files/lxd-2.5.initd
new file mode 100644
index 00000000..c1aef37
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.5.initd
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+
+ # remove with 2.0 release
+ need cgmanager
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-2.5.ebuild b/app-emulation/lxd/lxd-2.5.ebuild
new file mode 100644
index 00000000..809f11a
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.5.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# The source is repackaged using a script at:
+# https://dev.gentoo.org/~stasibear/lxd_repackage.py
+# This is necessary because go's native package management assumes
+# that a build starts with checking out many git repositories, often
+# from HEAD. This provides no way to build the same code repeatably,
+# and anyway portage requires that fetching is only done from SRC_URI.
+# The only sane alternative I've seen is in the consul ebuild, which
+# is more transparent but raises other questions.
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 golang-build l10n linux-info systemd user vcs-snapshot
+
+DEPEND="
+ >=dev-lang/go-1.7.1
+ dev-go/go-crypto
+ dev-libs/protobuf
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-dns/dnsmasq[dhcp,ipv6]
+ net-misc/rsync[xattr]
+ sys-apps/iproute2[ipv6]
+ 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"
+
+PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ default_src_prepare
+
+ tmpgoroot="${T}/goroot"
+ mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+ cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:${tmpgoroot}" emake
+ else
+ # build client tool
+ GOPATH="${S}:${tmpgoroot}" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ use daemon && dosbin bin/lxd
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+ einfo
+ einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+ einfo "a patched kernel and iproute2."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2017-01-03 14:04 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2017-01-03 14:04 UTC (permalink / raw
To: gentoo-commits
commit: 84820f97951810ff7abae4e4e449bbda038b58ee
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 14:04:41 2017 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 14:04:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84820f97
app-emulation/lxd: remove old versions
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-emulation/lxd/Manifest | 3 -
app-emulation/lxd/files/lxd-2.2-dont-go-get.patch | 22 ---
app-emulation/lxd/files/lxd-2.2.confd | 27 ---
app-emulation/lxd/files/lxd-2.2.initd | 50 ------
app-emulation/lxd/files/lxd-2.3-dont-go-get.patch | 22 ---
app-emulation/lxd/files/lxd-2.3.confd | 27 ---
app-emulation/lxd/files/lxd-2.3.initd | 50 ------
.../lxd/files/lxd-2.4.1-dont-go-get.patch | 22 ---
app-emulation/lxd/files/lxd-2.4.1.confd | 27 ---
app-emulation/lxd/files/lxd-2.4.1.initd | 50 ------
app-emulation/lxd/lxd-2.2.ebuild | 156 -----------------
app-emulation/lxd/lxd-2.3.ebuild | 195 ---------------------
app-emulation/lxd/lxd-2.4.1.ebuild | 195 ---------------------
13 files changed, 846 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index edd2aef..d0ab9fe 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,5 +1,2 @@
-DIST lxd-2.2.tar.bz2 2234844 SHA256 c76b8698a9266afa5e4aec3ccaa283226cc52232e10ad376f02c4bcd000126b7 SHA512 272cd02f8533a18a51739fd2698f239cd57ae852fbf828d3dc53ed1253629808984720bde9173ae7df1f9e94389ab929b53893e7b57c2d0f6571744365c1c93a WHIRLPOOL d76c5ed9bedde8d51403a452bfc1f33bcb19d71fca79439c63f2b70bd58544ff0c05f4008f2603935dd1c63c4d0ea5c733775c723330de692fc5f6cd471d1529
-DIST lxd-2.3.tar.bz2 2248758 SHA256 cd746b3f9682e50b7973e6175a5b48b999748face9e4b515491773ade9d754c4 SHA512 746ea9c2e9266a8482a62fc9e9fdb83f0713b0094e1b52957c5bf2fbd00f4bf1d7a0978086ab123d60ac02bd0dd1f00d46801959ced3b01308170dd7911c7bdc WHIRLPOOL f899e78bd3082ddd46dab5d09d83fe23a23aabbee09488f48ef2ff4a9f3bc41878ecb50b4223235c12962b01468c7b0124c0ae54e60d452f224824cbc89d144e
-DIST lxd-2.4.1.tar.bz2 2257768 SHA256 4a02c74819870be5df71227f90be4bc1b7cb90784c115c9f96a6174c8d4dcf75 SHA512 84ce4911a55d495f809a4174061577eceba0b3cd0381170a23fea91651049e43ec809494bf885b315b2d5fde7cda19ee29eed71259b88d3a789fd87c26aac3db WHIRLPOOL 70a2eb3c6b239e9d8682005134ae5c8e991b2f331685b971e1e8d09173aec8c34848527c9f893af0f937384d0f33f7a9e626f8063a00e2fa450331acf00ad7fe
DIST lxd-2.5.tar.bz2 2267313 SHA256 d87ac77ec6f47cd3e3417a78b0c315dac367bc89c532cf1784d80b31e57cfc8d SHA512 c023f2b9ccd958560eead23806cb60a04371a3721420f5c0d65e55cf2d7647d6690677619c4f8fa91573545817a1444d9d61f6a2b6ca8c3870136911cb1fbce9 WHIRLPOOL e4702e2597c5fe88ffa5139b829146ea474959799910bed79db617d9486da73d9de77c1ad398c1112d04109a858e5684f2c676bfe9fd4d68cf5081fbc0f6ae7a
DIST lxd-2.7.tar.bz2 2309735 SHA256 2681a77888e19ed95ea0bd562dee9d03d703d01d25ab8cb8e80eb6c6a5f115ed SHA512 53a34e96a1478bd73f5b12988a10162fc4d93554cfd66a38a82879662e63a6d34cbdba432dea6e45733cb66f3b40b46146c4be2d38a66eb3d553f8157104b212 WHIRLPOOL 7fd13e545c632ee16b96f172948509838bcd85fe3541bd014168acb978811827367d86461eb68579fd6aaf3311a87f960057f207eb9b5a6b908a0aac81a5004d
diff --git a/app-emulation/lxd/files/lxd-2.2-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.2-dont-go-get.patch
deleted file mode 100644
index 9402de5..00000000
--- a/app-emulation/lxd/files/lxd-2.2-dont-go-get.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /Makefile.orig 2016-07-11 23:34:40.299664675 +0000
-+++ /Makefile 2016-07-11 23:37:00.816018727 +0000
-@@ -12,19 +12,11 @@
-
- .PHONY: default
- default:
-- # Must a few times due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- # Must a few times due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.2.confd b/app-emulation/lxd/files/lxd-2.2.confd
deleted file mode 100644
index 3d55327..00000000
--- a/app-emulation/lxd/files/lxd-2.2.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.2.initd b/app-emulation/lxd/files/lxd-2.2.initd
deleted file mode 100644
index c1aef37..00000000
--- a/app-emulation/lxd/files/lxd-2.2.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-2.3-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.3-dont-go-get.patch
deleted file mode 100644
index 9402de5..00000000
--- a/app-emulation/lxd/files/lxd-2.3-dont-go-get.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /Makefile.orig 2016-07-11 23:34:40.299664675 +0000
-+++ /Makefile 2016-07-11 23:37:00.816018727 +0000
-@@ -12,19 +12,11 @@
-
- .PHONY: default
- default:
-- # Must a few times due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- # Must a few times due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.3.confd b/app-emulation/lxd/files/lxd-2.3.confd
deleted file mode 100644
index 3d55327..00000000
--- a/app-emulation/lxd/files/lxd-2.3.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.3.initd b/app-emulation/lxd/files/lxd-2.3.initd
deleted file mode 100644
index c1aef37..00000000
--- a/app-emulation/lxd/files/lxd-2.3.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-2.4.1-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.4.1-dont-go-get.patch
deleted file mode 100644
index 9402de5..00000000
--- a/app-emulation/lxd/files/lxd-2.4.1-dont-go-get.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /Makefile.orig 2016-07-11 23:34:40.299664675 +0000
-+++ /Makefile 2016-07-11 23:37:00.816018727 +0000
-@@ -12,19 +12,11 @@
-
- .PHONY: default
- default:
-- # Must a few times due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- # Must a few times due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.4.1.confd b/app-emulation/lxd/files/lxd-2.4.1.confd
deleted file mode 100644
index 3d55327..00000000
--- a/app-emulation/lxd/files/lxd-2.4.1.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.4.1.initd b/app-emulation/lxd/files/lxd-2.4.1.initd
deleted file mode 100644
index c1aef37..00000000
--- a/app-emulation/lxd/files/lxd-2.4.1.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/lxd-2.2.ebuild b/app-emulation/lxd/lxd-2.2.ebuild
deleted file mode 100644
index b5754f1..00000000
--- a/app-emulation/lxd/lxd-2.2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-
-# The source is repackaged using a script at:
-# https://dev.gentoo.org/~stasibear/lxd_repackage.py
-# This is necessary because go's native package management assumes
-# that a build starts with checking out many git repositories, often
-# from HEAD. This provides no way to build the same code repeatably,
-# and anyway portage requires that fetching is only done from SRC_URI.
-# The only sane alternative I've seen is in the consul ebuild, which
-# is more transparent but raises other questions.
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
- dev-go/go-crypto
- dev-libs/protobuf
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-misc/rsync[xattr]
- sys-apps/iproute2
- sys-fs/squashfs-tools
- virtual/acl
- )
-"
-
-PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- default_src_prepare
-
- tmpgoroot="${T}/goroot"
- mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
- cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- GOPATH="${S}:${tmpgoroot}" emake
- else
- # build client tool
- GOPATH="${S}:${tmpgoroot}" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md doc/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-}
diff --git a/app-emulation/lxd/lxd-2.3.ebuild b/app-emulation/lxd/lxd-2.3.ebuild
deleted file mode 100644
index 809f11a..00000000
--- a/app-emulation/lxd/lxd-2.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-
-# The source is repackaged using a script at:
-# https://dev.gentoo.org/~stasibear/lxd_repackage.py
-# This is necessary because go's native package management assumes
-# that a build starts with checking out many git repositories, often
-# from HEAD. This provides no way to build the same code repeatably,
-# and anyway portage requires that fetching is only done from SRC_URI.
-# The only sane alternative I've seen is in the consul ebuild, which
-# is more transparent but raises other questions.
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 golang-build l10n linux-info systemd user vcs-snapshot
-
-DEPEND="
- >=dev-lang/go-1.7.1
- dev-go/go-crypto
- dev-libs/protobuf
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-dns/dnsmasq[dhcp,ipv6]
- net-misc/rsync[xattr]
- sys-apps/iproute2[ipv6]
- 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"
-
-PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- default_src_prepare
-
- tmpgoroot="${T}/goroot"
- mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
- cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- GOPATH="${S}:${tmpgoroot}" emake
- else
- # build client tool
- GOPATH="${S}:${tmpgoroot}" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md doc/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
- einfo
- einfo "Networks with bridge.mode=fan are unsupported due to requiring"
- einfo "a patched kernel and iproute2."
-}
diff --git a/app-emulation/lxd/lxd-2.4.1.ebuild b/app-emulation/lxd/lxd-2.4.1.ebuild
deleted file mode 100644
index 809f11a..00000000
--- a/app-emulation/lxd/lxd-2.4.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-
-# The source is repackaged using a script at:
-# https://dev.gentoo.org/~stasibear/lxd_repackage.py
-# This is necessary because go's native package management assumes
-# that a build starts with checking out many git repositories, often
-# from HEAD. This provides no way to build the same code repeatably,
-# and anyway portage requires that fetching is only done from SRC_URI.
-# The only sane alternative I've seen is in the consul ebuild, which
-# is more transparent but raises other questions.
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 golang-build l10n linux-info systemd user vcs-snapshot
-
-DEPEND="
- >=dev-lang/go-1.7.1
- dev-go/go-crypto
- dev-libs/protobuf
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-dns/dnsmasq[dhcp,ipv6]
- net-misc/rsync[xattr]
- sys-apps/iproute2[ipv6]
- 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"
-
-PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- default_src_prepare
-
- tmpgoroot="${T}/goroot"
- mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
- cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- GOPATH="${S}:${tmpgoroot}" emake
- else
- # build client tool
- GOPATH="${S}:${tmpgoroot}" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md doc/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
- einfo
- einfo "Networks with bridge.mode=fan are unsupported due to requiring"
- einfo "a patched kernel and iproute2."
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2017-08-19 13:45 Patrice Clement
0 siblings, 0 replies; 31+ messages in thread
From: Patrice Clement @ 2017-08-19 13:45 UTC (permalink / raw
To: gentoo-commits
commit: 8a35d56e853f963ab287504a4b2a04377d68c23d
Author: Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
AuthorDate: Thu Aug 17 00:54:29 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 13:45:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a35d56e
app-emulation/lxd: version bump to 2.16.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/5457
app-emulation/lxd/Manifest | 21 ++
app-emulation/lxd/files/lxd-2.16-dont-go-get.patch | 16 ++
app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch | 11 +
app-emulation/lxd/files/lxd-2.16.confd | 27 +++
app-emulation/lxd/files/lxd-2.16.initd | 46 +++++
app-emulation/lxd/files/lxd-2.16.service | 10 +
app-emulation/lxd/lxd-2.16.ebuild | 224 +++++++++++++++++++++
7 files changed, 355 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index f3db6032669..b3a0db784cc 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,25 +1,46 @@
DIST github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz 15087 SHA256 727e3b7d4ed0df94b96c99ca69c3505303d4f93173c31b5afce20e6813d6a270 SHA512 7f2d849104993e089aac6abc01844a559239110fbe257469ee918de26ef6d77cc29027324204b38613346c6f0579afc66bd721f56c2c2062354ac31f4e7fd7e3 WHIRLPOOL 857821556293492db1bd1cfbaf6c376846a94e6a13d0c021051827e4be0defdafe4b0c81f4823620b619d04a9fdea077341376d9f4665964475ecd092aa9b343
DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 59915 SHA256 f80d8b1dd92d7f2ea4b48d2e4b20d726156d0920e90ae0d6e8ac540a0d156ba3 SHA512 c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee WHIRLPOOL e2a011888949ecdf0ecbce662ea30de731ce7393142d06b9a0116ebdbf46771dde7be89067785663ed93cc45bdc861122112cf8c3b8f6fa27018c0a100066b0a
DIST github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz 30367 SHA256 297ad610c697f409ae1fa434f09da1ba6acdf3bbfcdbe8079dc4b6a6668c12f0 SHA512 94342de3aad4db1c4442062f4cf4e57c723a43bbcb0069a8bed3b719e3864eef7500a24c9c99c755114708d6822e9b23f296b6d0b2b46f32cc6ffc65944d1729 WHIRLPOOL d3341fccb03237d8352c305ca1067449c0e00cc59297f9b14c98f38f2f6d463820469e6f13641dd5341ccc3d07a731b7436ed1a8eb3666e37a79e6447d336c1c
+DIST github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz 6476 SHA256 2c03218436fdcebe9e9fd970055155a543ae06eb5a2c631911e2bc358fe52c58 SHA512 cbbdd7066249a571cc4d052e7907150f575e18c078078199b18f7557e3b12fc7c6969e6fe55773c951f3f954d296707d9e4c74ce26e3b6f408263774b0315a52 WHIRLPOOL 9829d90b0be2ab4b522ac6b95295627877229ba6db1055b9c33ddf404a2d02922837056096ac3a287353edbcddb14966ddb89f160e95c2aff46bc0e758419329
DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 SHA256 2379edcc225238167aa0d45cb28d3561c5193979b136a6cf3443a1fe3b85c78a SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d WHIRLPOOL fc39214f5e5d7063069f7173bfea57483d3a8f46c586c704d93a9af1ebb534493de343a9f2dbbd51eb22de118db2f0e3e9838ee4df2c414d2921545f2ed3ed7f
DIST github.com-go-yaml-yaml-cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz 60805 SHA256 11a6ce686bb70ab92020f2dffadc2e024e267a6564a62b0091e2974474c7f88d SHA512 268498022f34c4b59b5b75443ee10fd4273203f4b77bfa11b08a792c004cf13e3010c34b4c15cee2b4e7f3c910648d9897700f60ab00b327d78c49e97497fe2b WHIRLPOOL b2d18dc7354fa6e4819c2b1437e3dce55212fbf6e907361b82bfefc0b2306f12cbf70560c3819e2a81426e538949f05be01c6b8b3f3e53a3aa6daf828e95d537
+DIST github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz 64789 SHA256 2f35fb36301bdee6afa5d7ec41c8870bca370ee8300b4da157ee3336812b5c36 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289 WHIRLPOOL 27c9123a8be869dbe6a15d1e69e39d511f44624fffd89aac37bf0e59c5d30f2b7932c6015fa055f3ffed9357873a2fb92c1f6522793a64b752722cd539bc2089
+DIST github.com-golang-crypto-b176d7def5d71bdd214203491f89843ed217f420.tar.gz 1431191 SHA256 9a7d565a11c3bb0aa78156c3ab6c6d55c2c8ff9e0d7733574b7f2e67fef03ebf SHA512 6cae1da26b6d46c4f080f74b574f5b7d7e1e86eeb83532e19f42e6e098e9f6d0b113cd07e66f43806ace738583262e37cbb7dc229f8d61ad16a5f86372eb539a WHIRLPOOL b2a1b6d19ee5d72e4b38b403bc3142385d543c713fb4729333e1614b114fb81789a4c94974811f67e3c61c0f03aa8f3fc91e61558d85eb507a7812d43052b7e8
DIST github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz 1336856 SHA256 28950420102f0dc290b84a52f06bc5b12a0a2b411b1b4fe216ba4ffe3ec3754e SHA512 c22fc86fbc22d6ec8157f89c075f07db8b72bf63ff97e06c907f555bf865cb77414c4fa2b9974407e43fa4f74b77710d3be9d2646f929fcfd5269b0ffc379914 WHIRLPOOL c85d338f87f5c418009497308ba28bd805769cb5350835dca35f77cce7ce456afe9cbcd66d9db3aea77e3eab0ed228260f7ec2e6825632624d9c80556ed15fbf
+DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 SHA256 37d0bf101e8fc7e1dd8f1aa83ef106befe02fef11dc6a12ea1f7cebdf1a160e1 SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c WHIRLPOOL d344671f614f0d43a313d1409ba20cad711bf8d3be7b0c52e6d2a7db0a3efbd17369cea70136a095522122a3cbaada7de4d79e2f7ad784b9e7fd8e46d54ec443
DIST github.com-golang-net-e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz 899910 SHA256 a92f1314f40ff6e542ac6e6ea1346cefcfc74e5e5de4939a1baa67c4f86a482b SHA512 0a582e9aa0ecee1c881771715970129d8af5975cccbb797f1e2eeeea7989b17448b26c000ef49fc7a1ae02eddebdfbc52dd2cd9a82b0b3b667b4ee7f62346052 WHIRLPOOL bdd305498d35c9ef3f1eb34878976e165117ec1c9d1eca8a28cb06a4616d54733e4e2504143990d0e74c6901bd5d6f717e2a0132fd0c4f74fdc305c7d983256d
DIST github.com-golang-protobuf-5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz 252930 SHA256 0f5d73fa192983fd67d0aa6b9f6e0c5fa64a966bfda42f7f4ffbd83163adf02b SHA512 ac284034ee27b275df8adb83ecf4eb85977cc9cf5266384a080df2beb2fdcb84af7e166cabaf76881b95eab4812997ab435adf0abd6068ed967f609b1747b6a7 WHIRLPOOL 87685c46c8813b8d4882aadb0b37437782f509efd8e59068f524cd100e11693bce0939087b923acd5214a14edcf76cf0ad71636ff634989d6c9dd5b02667ecfa
+DIST github.com-golang-protobuf-ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz 265243 SHA256 25454663aa8e0cf17f0bf273ce0e07703b75aadff9268707228fc76581b7d91e SHA512 25618656838aa0b20f5a4da59fa126d339fe8825a8cdea46ecbd05831751c3fbb86e496fc0930a38faf18760ebece510b505a2aae9b29ab659a081a02005099b WHIRLPOOL e61468e817d5ee34326ce795dd841922a00edc1ba5eb502a59fe095e100eee6273531823474f87b744a36007871a720d4312df921a1ccb9f30fedf986768c4cf
DIST github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz 15326 SHA256 25b869d922114e49906f2d9559c86b23b54f753986e58546d4ad816f426a9ad2 SHA512 912a5afe25c6854e14d72d9d0a897808ab9b67ba4f8428cd04fe7bb3ca815f1bd1b78667587fcd74967f88f44ea591b77616955dd130cc2f98eea922fdbacf61 WHIRLPOOL 91c3b07b66c56b0bce5f430f5e0573d30f57ebf83204cfcbadea5a88607f843c8176eadc2ebdae6020b4bc1144b9ae45ba03fb00c12070faa7505e4726f6b2e1
+DIST github.com-golang-sys-9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz 756878 SHA256 71c6138054b6ab517392e4f943183a12acf51c1abd9d4d1927563ffbdbf60812 SHA512 b1caae99c1575e588801e63775da86133f3f4f8380eddb148b9d38b34b21a20e1ad2e050c7a19bc7e1c77f5b450cafe67c06682d4cd4e7f7905f050f9f3cbabd WHIRLPOOL eadb6c57c7f82a684499d691874ae2e3bee7cbbef1a58f3cffdcee3f63fe5a7b0038ec12546283bfda575cdf99dc615be18bf4bdf4641800ed1dccfec8d3a044
DIST github.com-golang-text-ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz 4549711 SHA256 5bdfdcc6c259710ca398c1b6da7967d18dcdb8c6aaa56501da3f0333767d38ce SHA512 78941350134b98f0dd72b0397796106b309cc50e34d0741bb1b4e8795a653f6364e35061b1f36def969ab81a2b07ef80fa135baca3054116d58358d53dea282b WHIRLPOOL 870f029b29ed47881a1fbc71f4e903c43c215a56b0ce635956be6ef13fa4f379a793cfbd2dd9b70b031425245d5b3afbc84bb789fee7a2502575c472c0f3e0ba
+DIST github.com-golang-text-e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz 4604834 SHA256 17b5549b3463ad5f4adb10036294a521601de2c9d5e7bca946fef909b859c2a6 SHA512 26dd6fcf2c9e589f1fcdeef0197c0db12ddb2b3f526c1992b76954fde826aa01f86bf485ffefc312d9cfedd793d185475bb5d84c951e02e8df7586f0c6269749 WHIRLPOOL 9412e8790334e7558c3083f487aa257a38295ed325c183bfaca0b4d09c081353e368732d336808c32cdae9c0f183e4bfc8d90bdaa71aaeeb6c1c66b029c4ce10
DIST github.com-golang-tools-2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz 2224136 SHA256 33d0524e2173a3d1292ad2a280230c39bd3b4def2eccad5d4a058b5cb29a4c12 SHA512 dc36f88d348ae5c299c4909120caecab35964dbb85529e6e735bd507155173ab86b134cd39a1fdfc50b7f1f55345175604f29027b0b3e1acd7f3b312303aef70 WHIRLPOOL 7ef8bd2853654c99a9b38d3ea14418ea28834824392a67cc93513682ce260b15d970343773982e31e2b65029c19ffb6f562cf46f4b69b4a3e41acfdd525fc79d
+DIST github.com-golang-tools-84a35ef54dff3c5596983e180ec10919fc432242.tar.gz 2244664 SHA256 26436026e569cc2f9ef07c11eab48ecfba2a11966fc5ddf2e534be29235031b1 SHA512 df4621cda50f01542eb4cb106bff05680137f21b91b5524348a72aec0682e547724183e698621e573e34622c45031f54a071181941be168aabe96dc52d6931a5 WHIRLPOOL f407a1280e81e88a12869fe22a1e31c61e4076cfe872b8a864d810251653bba6d46dae60a993168bb5d2f9eb8abbbcda86edeb71ce4d082ee58b4c5c40446457
DIST github.com-gorilla-mux-18fca31550181693b3a834a15b74b564b3605876.tar.gz 29433 SHA256 f3fced6606c5e662aaef9d4cd71017438040af3ea419b3ac44dacf7c17dff91a SHA512 5bf7e9a6e8b01b235f5a9e697b5749d5655e62816d74b2173b123814f70aa92c5e0bc84cf40f643905354374efdcf1ffe8838d3a55d7e3abec29fd12a2e0239e WHIRLPOOL e4bca82d6c672290c5aa0683de5d81c787fcdfaf09bc2dd2ffd67f5e17c6cbbe829bb58b8e01861b692518550d4e8de359b7fcea175719e020e5ed31774806a4
+DIST github.com-gorilla-mux-ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz 29594 SHA256 8e3af8f0a839ae14d9267660758128cccd5b6ab16595de786961b297d5ee1ac7 SHA512 442e6249d273440eb5f31ca14b1ce4f702ca363ce385f34ed58189f96aac6a8f5314318cbbb61ff5376f1c6b660a81cd3f53948d79c081eb0c0d9e47657fb447 WHIRLPOOL 6af297833cece2d375da506b7b67b13761c12901da28c5ee63021fae50c4c55b72bd0d0ba70d265fbe2b8b747c7bff044a7bc57b7ec1ab990e5d373bd291465e
+DIST github.com-gorilla-websocket-a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz 42996 SHA256 b90c0b4117f2267a737b8573abbe139b706a6aa92257b346f6dd185d3135bde4 SHA512 95a107e3e8626bc17407b8ae14d8cf14b22be616a35e3a287aa9992bd952d0fd3e09668d8bd8e4af66bc7213dc2d1f0063c0c7edf7222a0e11423aba3a201d62 WHIRLPOOL 6a36def6799bcb77dab98c7a16818ab8db8c0c605c5fe9802c4026fa23cd7a761be55894c933e7683648af7177f9318b295d1b95c4510b0155a852c8356d9986
DIST github.com-gorilla-websocket-a91eba7f97777409bc2c443f5534d41dd20c5720.tar.gz 42927 SHA256 56858a67bb8b462f496e9b9795436824036ae17cc3a540284a4183a4c9ca3dcb SHA512 651d017498aca3fed375996a4cd77a5128396a14aaca4485e5480937f85d1ea8a734ec607d1658601ec6eb9b0b1e9a4756a0264c4dd86ac6bf2de556daa6693c WHIRLPOOL 5f1181de9500b03fde03f6ff8406a65987e60eb7018bd76defa3065c85e6b1d79f674024aeb000d0cb5a0bada96b6d757a82edce203bb8ff0d1c79a176868783
DIST github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz 9682 SHA256 23e121b4ea15818e26d840cba571fb1c165b785271b07f44d3b575e17070fc1a SHA512 99a00ecfeb4226bba01dbef615f02b22f54959252c9fb99ed55f8c040026305fa54256f78eceb5c02ac6a77842c72fda43d1790590adfdcf3202095ad836a198 WHIRLPOOL 0e3c101756336766d38a5a8d80349b55378456f6241ee53a873edf5a23e44f557dc1125c12892aef6a5fa70797da47f1ab72b0f5acb4502c10aa2be8d6c1aaf4
DIST github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz 24466 SHA256 3eb782a5ca1fe5da13d89a371cf9d41b870c1e03c4625064ae88aa6e489bfe65 SHA512 f5add63516e3d4a0797cda4fde3568aefd392a2986186cdca8c060ca51a8d5d09d3ba990578942c6ebf0441f94b9f042f7379c5c3897b4210ab861998a597088 WHIRLPOOL dadfadd3d5ae01c154dc1e09617b8ca0badd00d0015b6304619d6fa79b2040a65bf0f39f6aa6fb8503052ce9680188761d21f033e5d4ccabcb00299cdf393c57
DIST github.com-jessevdk-go-flags-5695738f733662da3e9afc2283bba6f3c879002d.tar.gz 54989 SHA256 6a46bc8a692a1153b12a889b357683aa2aa2254d162ddb1c38253d7988cf1030 SHA512 9f117c43a41ee7b8753ba8bcb9ad49ad5106ce01b3be617921ed9d1208bd5bc1c4c155d797f2b1f7134955b16f3d82e46de2b0a45e5e8808199e0173687719b1 WHIRLPOOL c6f230afc0467fb6d76a2da9867e8437833471a7c36073d74834a5af399e8e6cfef0bd40bc5ae9cce4fad15c8b1d03b03110ee20c86ca4c281b5204f9e28e0fd
+DIST github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz 55513 SHA256 c67846e5532a92d3ee629bc67eed7a12bfefe0b837182daef51ebb9774697d25 SHA512 cf4c45b2a0f314874dc4bd2cbedddfd6f46ed71d6b51198365db17d4a4fc6b2ecce000968b62d6c883f596bd8847f0429f3fbbfddb0ab7369a3a6b78d83c48c8 WHIRLPOOL 59be6ddb176a25cdbd0a48ed829259c49911e76c63f9f1f3a4027a0f4e0ed7c7ae39b7b3a99cc49fec99fcec6b4941ab066da9795eeee41a168c63f7e8425786
+DIST github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz 16210 SHA256 eafa160a17919edabe61aed53ea7c129499ad9ee169134da8532b89c920d01d0 SHA512 04dfe2f155724d98c31fa2d274a13e77efc34364ffae172fffbc8e14b72f68a6301e6f582c1ff9f37cb105d11a7b3197e2ffa635f410ffb64d54e7c6fd1b9d1a WHIRLPOOL 76989d50938b01ecad8f0fee239a3e5bd4a829e8fa78a4f9b6d9e0711ebef5fef7d8786e28cfc03477017a4b5b2b5e4659c05f98d7239a4d5251878004d010ff
+DIST github.com-lxc-go-lxc-1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz 36338 SHA256 818389b46709ad9c248157d421219d2d04cc009ce43df6f173019e3d7dcf89df SHA512 92b69f1d6fe6dcbf67c4ec73be84dd066d6396c6f4be200ab3ec41654505870a94fe92c0d06d09c18c9ae634ee67377f79d6465b3640099409f25a6254fdae58 WHIRLPOOL 1e2b0b960a8f21e60455378dcc39f025e3dddee50a26c084cc2fc9eea506fe07a277c7a7810a273ade52378bed34acadc3f38563eebe4a4a81d7110c52ee660c
DIST github.com-lxc-go-lxc-de2c8bfd65a78752d6a70b4ad99114c6969363b0.tar.gz 36156 SHA256 7e794163a24488854f2ff48468e699577dcff82871717913cd7a079dc83d292c SHA512 57e84c66b8c8260e3d2631b37e5dabcaf5136e47ed4233489f8fd3b2cc8796c495dbc78390e4372b0cc54ee5920d1f469579f77de1c0291c3ae31dfd6b628dbb WHIRLPOOL 61e8d12211a0ea1eebaba824f4adc2784f26ed0c8496e74d51f02a7647f526954001ced5d3559bd2e2de8fa4c6ab76dd6d15cb8cbf678ec36db5613fcce9accb
+DIST github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz 8089 SHA256 ad1e8de71cee50acb8492bcaa9b1a7d0ebe175f76266a8f3dd4d7fb48d8e53be SHA512 0f458e6acfec266b58cd458bd05bc04617df0ef223ffa6a6c374decd29555a78441f3a17df7b5f782d96a25f56bcece061407e9778e25ceafeedafa014a45bb4 WHIRLPOOL e18e5c426b611f5ba102c2bfa935c26bf5be3b42e48c2b337d3827936361daa28ba1185337b1e25d5732063e0cd539661cb740028f811577cd0250ea24b4e0fe
DIST github.com-mattn-go-colorable-ded68f7a9561c023e790de24279db7ebf473ea80.tar.gz 7522 SHA256 454e4134a81b0913cd22fd6efc50164cc352218f81e1a73ee209a95a7d017f09 SHA512 ae09fd28e2aae98d0b73bf71ee7496d8d53e20232428d09e021ee8571ca7e990e85c0d9613c89851e2025624d317a26e1768f4e7af12294eb1a189a241bd8daf WHIRLPOOL 567d3a684eeca18e8703714197b23ad9d7157fa50664ea09a0ab130635cb75fdc543aacb23a347324d9dd15b44081f0393e7db1a1d8e9159b9fd3e703cb7d008
+DIST github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz 3262 SHA256 c013b75f090745e80bc5e3060a26d7053ebc63bd3d077177aa7a3e349bf151ca SHA512 8627d22f5ee5a087744bbf4dd391f8f87ebabe8940564206935dec9e406e40a98976479ea973e61afeb1774df211992cd61c67ee198d546e22fbf60826b64ac9 WHIRLPOOL be9969d0cca83428e9f6eadfffd970d95ae8c0562c00005303eb8122b2cd737410372458e2cd8e6328ff65536d5b7d6b60e34f94fac8cb4d582202dae4e0b94a
DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 SHA256 60afaf4d86f11a5d256d240cbccba766c5ef6ba2e695661df6bc4608021ca186 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70 WHIRLPOOL 5606a1879961eed55f00e3d7cfb21663db1d9f7059a586ea5a423f58655713a333d89ceb8dab328af0cea9d13e9dd02bde49bff6a086d80d571a03c79fc72ba8
+DIST github.com-mattn-go-sqlite3-6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz 2028435 SHA256 650ece3ec45fe26df3879e3e67fc4e21f65547d441b4085f4910817dae54509e SHA512 743b713ff506517c05ea89fe744eebd5b67751305fc720459840ec6c2d0f2d1fff8437f668a38291b9686ecf940a5177c356c34e022fc020540e0f8c60a21ba8 WHIRLPOOL 840e78119db23b74a231d8f01c6f6a20ce5d5933aafa2dda9c2c1179c5f69f2c7e17fb59a5e5771252cc89b859bcc7ed32f777a5bf139f80e0fb6e026d9e2c6e
DIST github.com-mattn-go-sqlite3-83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz 2027317 SHA256 f108517a1ef06a51044a869f4da473b5e3f5f664afeaf4eeb9956c4bc2ad059c SHA512 687b1c9f7b2f27be4ef0d924f691f17251fb84522647436d3e6d1ba5946208618156663d817d146f954ea07d31619c446a3023f9a811f113a3761cda0daebdec WHIRLPOOL 26747056149e68ed1c9b59cfe5e1a6b0b38cdcd06a2d28ea68fef09085969dc1d706be70438552854c35096d3ce6405b6450da6fa5beae911da0e4b8730df8d0
+DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 SHA256 a3f2a6f367b97d8406402a674eaf96c5ee9baab05de32b2031085b8d92e7eea1 SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929 WHIRLPOOL f43f7093b37580845a7e87fe487684d5ef5e51646413d9188e6e3895403a6e028f873c1fc52ae60cf9d677cc9c3d5373c6cb39cb05e3632172ff3827ae4f7064
DIST github.com-olekukonko-tablewriter-febf2d34b54a69ce7530036c7503b1c9fbfdf0bb.tar.gz 11822 SHA256 080a2090ffb58f682a3b15aeccc866b8ff3acfa2020eaaf138b3d0b27f29d0db SHA512 bfccf8eacd32840ec195c0e69d141fc24ca55d9f0832b38ad87e0c2292c61f5ff0731e83a19045ddebde4db8b9cd77b0b84214c5442f4cd4f8a892e77efce758 WHIRLPOOL ca608bae83163bfb2640d2956021f849cbfe6e827f40120b9151ba663fcf248b3157d3a0eb294747ae0f8b9510c79443d9e3193294b874578b2dd3e68cf9a3c2
DIST github.com-pborman-uuid-1b00554d822231195d1babd97ff4a781231955c9.tar.gz 12808 SHA256 54da54d54a914e569fb2b31132e0c458ece12d7cd70c14a33adf95731e07afe7 SHA512 c332bd39781e7a3bd7125bbf26e62da2aca24bb89975491a4165a17580f3ffb99587e4620a9c9c17afff5d34865ae0b86065e1516ca325d0edc4dd84be269283 WHIRLPOOL fb245c1056abe69f7e3fa5a4ded80111777af2fdc107dee3fc36faa25bea8394eb30fda6000075cbdf124cb01c4165ed08fb154d70c30c8a1812988e2bd86619
+DIST github.com-pborman-uuid-e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz 12805 SHA256 5093e139937f8da5577e9f33e21ffc3a59ebff6a3264b80e8c5524c113bdaf44 SHA512 ab27b50c06384f20637e628d7e7289ff4b9f00f2fdb5e650aa7f4bf19bcd54cdd1b83fd9e3c45eede2ba8f35af9b177972597205ea29570b129f9a97e6c63c0e WHIRLPOOL 5baf15dc682df9daac2bed1ee083e49a4823a09599a85f38ef2bc3b17fe5d7fa5f0d02f841148a6e247fd664812e0a4ee4ce238aa93ceecc98e9c5a75921751d
+DIST github.com-stretchr-testify-890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz 94296 SHA256 39889d7ef7b263edc99dd0ec8a72d86fd44915a59dad41a958d522c2b23d8e64 SHA512 7cdc1bdd6711496280aae5ad5efb51bf9d6f9a271e89ab7c2af4a94d6bccf67958ef00d1805b9278903309dab20aa0d5b15105a7284a940b1e0ebfd78901ecb0 WHIRLPOOL 9565e5f455c1843732fa394dfb6f6a296cbb5f10afb6f82646b437273bd3c1c587b9991cde6a650ab760947a8547d82d5eb80f6965d16e2b2ced3857b9a1bb3a
DIST github.com-stretchr-testify-f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz 94237 SHA256 91f64ae4d5093511464b5ddce34b88b0134219a0a17d638fe148b6cb9f9e261a SHA512 3aaa245f70dcee49b08e5f677dfa2137b00cc0cbc18cd52d773722b951ec579e3f4e146f951de51973630488a9d9efc7c54462842c6fe5987cc099a44f04a03f WHIRLPOOL 3e55426a5f3086c3e46652da4f5bebf214ae620950556b6659b48cad01e51781d836a3c1ea9c692dc59b4a3d4862e16cec1acffd31a0b4853f97c4f67c22c2c8
+DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 SHA256 e63800ecdd704541bafcf8788d651a73599cdead61cd5bccedd31418c4fe58bc SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae WHIRLPOOL ec73f593f37d28565f9efe9b21d17175353b922e144842666b81163538b5d464dcdb4857897f5c1a4362fb44637490c3994f958498672fc31054539f2b5c64e3
DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz 9894 SHA256 1c90570f690a5b753633bce84097942021893f180c9d27c0b83f7a1bddaf59d9 SHA512 ee2de5568b76b87723e80e081e16094093f09a6be68dd0920793e007d4b705808ec1eac7a15b4c0ce7ed20aff04978f4ade264ab5bf5bdc5e2fdc46db2f4116c WHIRLPOOL ce1a13e5374248ffccaa613d399447d619ad94156f6ebf198d9e63019bd698496d67770ef520b802c59451ff9ad95d9fd789e8c9f758d1df553e2432c3b29289
DIST lxd-2.14.tar.gz 629982 SHA256 0ccf98257482458ff417c8af141a1f726fe7e696b7ab8b089ed1ee741280b2b8 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3 WHIRLPOOL 3483b15f7e09e8212fa5b646e5fc6be305b48e6cfcad5538ff9a4967820928b3f87931ca38fc4787ecab67216d2c876476880551ce56e3ed0c080a7b769e2823
+DIST lxd-2.16.tar.gz 629982 SHA256 0ccf98257482458ff417c8af141a1f726fe7e696b7ab8b089ed1ee741280b2b8 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3 WHIRLPOOL 3483b15f7e09e8212fa5b646e5fc6be305b48e6cfcad5538ff9a4967820928b3f87931ca38fc4787ecab67216d2c876476880551ce56e3ed0c080a7b769e2823
diff --git a/app-emulation/lxd/files/lxd-2.16-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.16-dont-go-get.patch
new file mode 100644
index 00000000000..a6e25e325b9
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.16-dont-go-get.patch
@@ -0,0 +1,16 @@
+--- /src/github.com/lxc/lxd/Makefile.orig 2016-07-11 23:34:40.299664675 +0000
++++ /src/github.com/lxc/lxd/Makefile 2016-07-11 23:37:00.816018727 +0000
+@@ -13,13 +13,11 @@
+
+ .PHONY: default
+ default:
+- go get -t -v -d ./...
+ go install -v $(TAGS) $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- go get -t -v -d ./...
+ go install -v $(TAGS) $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch b/app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch
new file mode 100644
index 00000000000..410efd9987e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch
@@ -0,0 +1,11 @@
+--- /src/github.com/lxc/lxd/po/fr.po
++++ /src/github.com/lxc/lxd/po/fr.po
+@@ -1110,7 +1110,7 @@ msgstr ""
+ "Toutes les fonctionnalités de LXD peuvent être utilisées à l'aide des "
+ "commandes ci-dessous.\n"
+ "Pour de l'aide avec l'une des commandes, simplement les utiliser avec --"
+-"help.\n"
++"help."
+
+ #: lxc/action.go:45
+ msgid "Time to wait for the container before killing it"
diff --git a/app-emulation/lxd/files/lxd-2.16.confd b/app-emulation/lxd/files/lxd-2.16.confd
new file mode 100644
index 00000000000..3d553276a5e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.16.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.16.initd b/app-emulation/lxd/files/lxd-2.16.initd
new file mode 100644
index 00000000000..51c8e7e0655
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.16.initd
@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/files/lxd-2.16.service b/app-emulation/lxd/files/lxd-2.16.service
new file mode 100644
index 00000000000..d00635fbcdd
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.16.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Container hypervisor based on LXC
+
+[Service]
+ExecStart=/usr/sbin/lxd --group lxd
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-emulation/lxd/lxd-2.16.ebuild b/app-emulation/lxd/lxd-2.16.ebuild
new file mode 100644
index 00000000000..28243c918ab
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.16.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2017 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/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
+EGO_VENDOR=(
+ "github.com/dustinkirkland/golang-petname 1f4996aa8aa05ee066aaf9e3179d340b48c6da74"
+ "github.com/golang/protobuf ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e"
+ "github.com/gorilla/mux ac112f7d75a0714af1bd86ab17749b31f7809640"
+ "github.com/gorilla/websocket a69d9f6de432e2c6b296a947d8a5ee88f68522cf"
+ "github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
+ "github.com/jessevdk/go-flags 6cf8f02b4ae8ba723ddc64dcfd403e530c06d927"
+ "github.com/mattn/go-colorable ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b"
+ "github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
+ "github.com/mattn/go-sqlite3 6654e412c3c7eabb310d920cf73a2102dbf8c632"
+ "github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387"
+ "github.com/pborman/uuid e790cca94e6cc75c7064b1332e63811d4aae1a53"
+ "github.com/stretchr/testify 890a5c3458b43e6104ff5da8dfa139d013d77544"
+ "github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
+ "github.com/go-stack/stack 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
+ "github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe"
+ "github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
+ "golang.org/x/crypto b176d7def5d71bdd214203491f89843ed217f420 github.com/golang/crypto"
+ "golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+ "golang.org/x/sync f52d1811a62927559de87708c8913c1650ce4f26 github.com/golang/sync"
+ "golang.org/x/text e56139fd9c5bc7244c76116c68e500765bb6db6b github.com/golang/text"
+ "golang.org/x/tools 84a35ef54dff3c5596983e180ec10919fc432242 github.com/golang/tools"
+ "golang.org/x/sys 9f7170bcd8e9f4d3691c06401119c46a769a1e03 github.com/golang/sys"
+ "gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
+ "gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2"
+ "gopkg.in/inconshreveable/log15.v2 b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f github.com/inconshreveable/log15"
+ "gopkg.in/lxc/go-lxc.v2 1a2cf29ce27f74298fe70acbf817ca2f46cf7457 github.com/lxc/go-lxc"
+ "gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
+ "gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml"
+)
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de el fr it ja nl ru sr sv tr"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 golang-build l10n linux-info systemd user golang-vcs-snapshot
+
+SRC_URI="${ARCHIVE_URI}
+ ${EGO_VENDOR_URI}"
+
+DEPEND="
+ >=dev-lang/go-1.7.1
+ dev-libs/protobuf
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-arch/xz-utils
+ >=app-emulation/lxc-2.0.7[seccomp]
+ net-dns/dnsmasq[dhcp,ipv6]
+ net-misc/rsync[xattr]
+ sys-apps/iproute2[ipv6]
+ 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"
+
+PATCHES=(
+ "${FILESDIR}/${P}-dont-go-get.patch"
+ # See https://github.com/lxc/lxd/pull/3390
+ # (I thought I could remove this for v2.16, but apparently not...)
+ "${FILESDIR}/${P}-fix-fr-po.patch"
+)
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+src_prepare() {
+ default_src_prepare
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes "${S}/src/${EGO_PN}/po" "" .po
+
+ # Examples in go-lxc make our build fail.
+ rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ emake
+ else
+ # build client tool
+ emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}" || die "can't cd into ${S}"
+ dobin bin/lxc
+ if use daemon; then
+ dosbin bin/lxd
+ dobin bin/fuidshift
+ fi
+
+ cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
+
+ if use nls; then
+ local lingua
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_newunit "${FILESDIR}"/${P}.service ${PN}.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+ einfo
+ einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+ einfo "a patched kernel and iproute2."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2017-09-24 11:18 Agostino Sarubbo
0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2017-09-24 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 3d371f7b42b45dfcf33bef20358de09491a8b9a5
Author: Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
AuthorDate: Sat Sep 23 13:10:27 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 11:17:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d371f7b
app-emulation/lxd: remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.1
app-emulation/lxd/Manifest | 10 -
app-emulation/lxd/files/lxd-2.16-dont-go-get.patch | 16 --
app-emulation/lxd/files/lxd-2.16.confd | 27 ---
app-emulation/lxd/files/lxd-2.16.initd | 46 -----
app-emulation/lxd/files/lxd-2.16.service | 10 -
app-emulation/lxd/lxd-2.16.ebuild | 206 ---------------------
6 files changed, 315 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 6e4dd01ad85..633257973bd 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -8,31 +8,24 @@ DIST github.com-go-yaml-yaml-cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz 608
DIST github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz 64789 SHA256 2f35fb36301bdee6afa5d7ec41c8870bca370ee8300b4da157ee3336812b5c36 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289 WHIRLPOOL 27c9123a8be869dbe6a15d1e69e39d511f44624fffd89aac37bf0e59c5d30f2b7932c6015fa055f3ffed9357873a2fb92c1f6522793a64b752722cd539bc2089
DIST github.com-golang-crypto-7d9177d70076375b9a59c8fde23d52d9c4a7ecd5.tar.gz 1432665 SHA256 238c9ed9693ada60d89b1aea20007dcc1d29754ea25b537e3b9de6188151270d SHA512 d107abb176bf37a0a5a2487cb00b5d12e2247d41524a0651860c0a0b41b2b80926af024b78cc12aacafe254a1b8245980ab219a8357c8c2e17e9245f9027e570 WHIRLPOOL d448afb23308a8f7ea42b8bdec8ae182a7bff335800f91cd3c8e7398de87b4a30c71ac6083d8dee548a64db35f8158649420cc562a94ac9e4871e81dade404e4
DIST github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz 1431151 SHA256 0dc71491c29f8a217fadbced9ed7d9216f361b6d0fb09dfd030e6fe116e83be0 SHA512 ff5eaf61e7dc133a56a90d100c4b48fd2775145b457febdd1eb9ec39c15ce6bc73665873bbe658d6b4bb94a008d7246317d751a41b5a62b43d2055ed3cb01e02 WHIRLPOOL 3289466f54fb998d4ecc7b757a24e4f7aef88b29e16df75a0e47b5dcb84594462508161d06589a13099df72afa12b90b701efa412cbb352cb21f282b20c6361c
-DIST github.com-golang-crypto-b176d7def5d71bdd214203491f89843ed217f420.tar.gz 1431191 SHA256 9a7d565a11c3bb0aa78156c3ab6c6d55c2c8ff9e0d7733574b7f2e67fef03ebf SHA512 6cae1da26b6d46c4f080f74b574f5b7d7e1e86eeb83532e19f42e6e098e9f6d0b113cd07e66f43806ace738583262e37cbb7dc229f8d61ad16a5f86372eb539a WHIRLPOOL b2a1b6d19ee5d72e4b38b403bc3142385d543c713fb4729333e1614b114fb81789a4c94974811f67e3c61c0f03aa8f3fc91e61558d85eb507a7812d43052b7e8
DIST github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz 1336856 SHA256 28950420102f0dc290b84a52f06bc5b12a0a2b411b1b4fe216ba4ffe3ec3754e SHA512 c22fc86fbc22d6ec8157f89c075f07db8b72bf63ff97e06c907f555bf865cb77414c4fa2b9974407e43fa4f74b77710d3be9d2646f929fcfd5269b0ffc379914 WHIRLPOOL c85d338f87f5c418009497308ba28bd805769cb5350835dca35f77cce7ce456afe9cbcd66d9db3aea77e3eab0ed228260f7ec2e6825632624d9c80556ed15fbf
DIST github.com-golang-net-0744d001aa8470aaa53df28d32e5ceeb8af9bd70.tar.gz 920361 SHA256 03f6f00d1142924dfee5abd67e6a39801a1da5c9f372a122aaaaf3c65de58a39 SHA512 d308b4f872612287c29b815b6ac0c4c3efbda4c641940ed8553851b1e93c6654bf443367b5ec96166d68fc2759d7e90e46fd6f148f0a6d535bf057bb785627d7 WHIRLPOOL 3d058a51d06992f8c07640f2ff6e69c5a0c468251420857b26da30fb6dc9b15f169321a7a4a29849aa6f346122339a0758875d6afd31d8d85a0cf3be8bb481f2
-DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 SHA256 37d0bf101e8fc7e1dd8f1aa83ef106befe02fef11dc6a12ea1f7cebdf1a160e1 SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c WHIRLPOOL d344671f614f0d43a313d1409ba20cad711bf8d3be7b0c52e6d2a7db0a3efbd17369cea70136a095522122a3cbaada7de4d79e2f7ad784b9e7fd8e46d54ec443
DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 SHA256 5140f8089da711f07bcdffd50b262cc9a6d53dc4c2ebeffd5bd6ef04d103775b SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3 WHIRLPOOL b48dd92edf0ce8cb27b57132a888b0f7ac2b7b844f62aebe072e5fa3beb9921a409c547c6fd2701f1f4ba68a580e8c5988d915cc8cbeaee62356399d3848f2f6
DIST github.com-golang-net-e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz 899910 SHA256 a92f1314f40ff6e542ac6e6ea1346cefcfc74e5e5de4939a1baa67c4f86a482b SHA512 0a582e9aa0ecee1c881771715970129d8af5975cccbb797f1e2eeeea7989b17448b26c000ef49fc7a1ae02eddebdfbc52dd2cd9a82b0b3b667b4ee7f62346052 WHIRLPOOL bdd305498d35c9ef3f1eb34878976e165117ec1c9d1eca8a28cb06a4616d54733e4e2504143990d0e74c6901bd5d6f717e2a0132fd0c4f74fdc305c7d983256d
DIST github.com-golang-protobuf-130e6b02ab059e7b717a096f397c5b60111cae74.tar.gz 268449 SHA256 b9d3381955d095b8c4b26d0464f87e3b32f65fee51c2f791338bcdfea21a1ad8 SHA512 3caefc21de9d57ee484e32d831997efe1e086af652fbbff210c2097db03f933be78446ceea9d004200939b6d48737d716fae0674e1e142179e8ccd1827f3a228 WHIRLPOOL 0155a8e9cd779b1d636edad7b95bd8064b179aaa4139d722e1e423eece8be5cc462a9feed4bc1134b1530d2b04b336cd363c5b5cdc24c8caac707d3c20e06bda
DIST github.com-golang-protobuf-17ce1425424ab154092bbb43af630bd647f3bb0d.tar.gz 266836 SHA256 3f82e7552c325c68b728c17f5b7ebfed200ca376c39353abc2f896756e2291dd SHA512 e6f093a5a8231e8e51daa2c5adf1db8da9dbeddc42fb6d05cd1f0cc03e2f3c1a65647b5463f3d71d94361d8a31163ee4fcc32e57a3e2df9e0a557c06469d88a8 WHIRLPOOL a08ee48e3e9c18aa420d4f15aaa7a1b957e1be12b3db14805904a1e55eb832db4eca830c07ce39f9915a455b4269c63ef4c8cea2f3fd8d84f45dba3c05d4bc66
DIST github.com-golang-protobuf-5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz 252930 SHA256 0f5d73fa192983fd67d0aa6b9f6e0c5fa64a966bfda42f7f4ffbd83163adf02b SHA512 ac284034ee27b275df8adb83ecf4eb85977cc9cf5266384a080df2beb2fdcb84af7e166cabaf76881b95eab4812997ab435adf0abd6068ed967f609b1747b6a7 WHIRLPOOL 87685c46c8813b8d4882aadb0b37437782f509efd8e59068f524cd100e11693bce0939087b923acd5214a14edcf76cf0ad71636ff634989d6c9dd5b02667ecfa
-DIST github.com-golang-protobuf-ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz 265243 SHA256 25454663aa8e0cf17f0bf273ce0e07703b75aadff9268707228fc76581b7d91e SHA512 25618656838aa0b20f5a4da59fa126d339fe8825a8cdea46ecbd05831751c3fbb86e496fc0930a38faf18760ebece510b505a2aae9b29ab659a081a02005099b WHIRLPOOL e61468e817d5ee34326ce795dd841922a00edc1ba5eb502a59fe095e100eee6273531823474f87b744a36007871a720d4312df921a1ccb9f30fedf986768c4cf
DIST github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz 15326 SHA256 25b869d922114e49906f2d9559c86b23b54f753986e58546d4ad816f426a9ad2 SHA512 912a5afe25c6854e14d72d9d0a897808ab9b67ba4f8428cd04fe7bb3ca815f1bd1b78667587fcd74967f88f44ea591b77616955dd130cc2f98eea922fdbacf61 WHIRLPOOL 91c3b07b66c56b0bce5f430f5e0573d30f57ebf83204cfcbadea5a88607f843c8176eadc2ebdae6020b4bc1144b9ae45ba03fb00c12070faa7505e4726f6b2e1
DIST github.com-golang-sys-429f518978ab01db8bb6f44b66785088e7fba58b.tar.gz 769610 SHA256 62f47292c34506c5208b8fddab5e6c61ce65a557f5a2b167ba5953eb981fac15 SHA512 d3713f07cabdd7d25516a25ef4428de9bb5384970c28706887a952bc73fa7f99e6cb2b3a057195670b29fe447dffb3796e23e4863d5e28778609a799dffc1347 WHIRLPOOL 4e27190805038fa0ba24a1b01c194d239bdebde7036a48985cb0905705e042558c5067175df96b7852df1de8ebe89c4ea1e0645d0b0bd8b33aaeedc7156c4f2d
DIST github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz 766292 SHA256 cb5b32b2d95a724f52104bcf9b9c2afa85b5d3eba0e31ec6cedb7381c90d26a2 SHA512 8d35c2b54cebae7f0f21916dd72be6132c22402829830f7b34805338f81e96da61977b346b72aadecec72c5eb1560998c7523fe0e6828813d635e06cf230934d WHIRLPOOL 8e2213c8dcb39d943ad77e7667d58afa26f550b7208103968a227b4e99d05f9a3e5767fa0c4f4b9198e6e113479505a32bc8d01eba67e06cf5e3b35e9edb1939
-DIST github.com-golang-sys-9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz 756878 SHA256 71c6138054b6ab517392e4f943183a12acf51c1abd9d4d1927563ffbdbf60812 SHA512 b1caae99c1575e588801e63775da86133f3f4f8380eddb148b9d38b34b21a20e1ad2e050c7a19bc7e1c77f5b450cafe67c06682d4cd4e7f7905f050f9f3cbabd WHIRLPOOL eadb6c57c7f82a684499d691874ae2e3bee7cbbef1a58f3cffdcee3f63fe5a7b0038ec12546283bfda575cdf99dc615be18bf4bdf4641800ed1dccfec8d3a044
DIST github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz 4624392 SHA256 4a125a94d8cf95b12783cc29b13fbb821d9e06a5fce2122b1920e81d4ca63bda SHA512 c37cc66e33e89d23a2fa4b707589316f9e28fe1d7131bb6208c0dcbd514f879dfff78328b871eb6d3ea1610f8b3f1d8c3061d94f88bc658d7bd8df2a19851c45 WHIRLPOOL f2f3c0498056de625a0e3d33e6cee84723b2934ae788512ef43e119be22bfc437fa590eea2ea3dbb5d14bdb3769adad59910c320f900d8763a8a1cf5b4078f41
DIST github.com-golang-text-bd91bbf73e9a4a801adbfb97133c992678533126.tar.gz 4610285 SHA256 650d045a890228f43211a2df5bc254d9cc80723bcc6ecf61fb9df2e81c75d35b SHA512 a57f839fef4b7fe086b4238c38396d3ead49be20674899cfef8d723028e9dbd7ccc8fe8b76a84d53137b7cea26aaa594e68b9cd7b0a2816fae71f5c3ad15ec13 WHIRLPOOL fe6bcbfb389a8041f28fefec9b65c71fba8c6025a71a82ed8325664b8870da5ca6e4a021c6d144a36d08775925ee77575096d4a7c50dd407b4b2d85fa0c392df
DIST github.com-golang-text-ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz 4549711 SHA256 5bdfdcc6c259710ca398c1b6da7967d18dcdb8c6aaa56501da3f0333767d38ce SHA512 78941350134b98f0dd72b0397796106b309cc50e34d0741bb1b4e8795a653f6364e35061b1f36def969ab81a2b07ef80fa135baca3054116d58358d53dea282b WHIRLPOOL 870f029b29ed47881a1fbc71f4e903c43c215a56b0ce635956be6ef13fa4f379a793cfbd2dd9b70b031425245d5b3afbc84bb789fee7a2502575c472c0f3e0ba
-DIST github.com-golang-text-e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz 4604834 SHA256 17b5549b3463ad5f4adb10036294a521601de2c9d5e7bca946fef909b859c2a6 SHA512 26dd6fcf2c9e589f1fcdeef0197c0db12ddb2b3f526c1992b76954fde826aa01f86bf485ffefc312d9cfedd793d185475bb5d84c951e02e8df7586f0c6269749 WHIRLPOOL 9412e8790334e7558c3083f487aa257a38295ed325c183bfaca0b4d09c081353e368732d336808c32cdae9c0f183e4bfc8d90bdaa71aaeeb6c1c66b029c4ce10
DIST github.com-golang-tools-2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz 2224136 SHA256 33d0524e2173a3d1292ad2a280230c39bd3b4def2eccad5d4a058b5cb29a4c12 SHA512 dc36f88d348ae5c299c4909120caecab35964dbb85529e6e735bd507155173ab86b134cd39a1fdfc50b7f1f55345175604f29027b0b3e1acd7f3b312303aef70 WHIRLPOOL 7ef8bd2853654c99a9b38d3ea14418ea28834824392a67cc93513682ce260b15d970343773982e31e2b65029c19ffb6f562cf46f4b69b4a3e41acfdd525fc79d
DIST github.com-golang-tools-3b1faeda9afbcba128c2d794b38ffe7982141139.tar.gz 2246286 SHA256 a9437023d0c7cc757cec3ab76abea815e424174698d3bfd1160ba3c82a6729a1 SHA512 d36353fcfb96947a5f50b768e19bba6a075d71e0bec2bb3103869ba33e023de9a0163b127ae303c9e4ed8b3226c831d63a6eb8cdbfdb4b7d17bbd9e86616497c WHIRLPOOL d2636f80821f770e43565470b2af306bf237fa55d8a2d0c25c97ca5341499ee7f2e7245bcf799209d5eb72f12e9b8d7d2249305a2145de940c0fecc6aabf4854
-DIST github.com-golang-tools-84a35ef54dff3c5596983e180ec10919fc432242.tar.gz 2244664 SHA256 26436026e569cc2f9ef07c11eab48ecfba2a11966fc5ddf2e534be29235031b1 SHA512 df4621cda50f01542eb4cb106bff05680137f21b91b5524348a72aec0682e547724183e698621e573e34622c45031f54a071181941be168aabe96dc52d6931a5 WHIRLPOOL f407a1280e81e88a12869fe22a1e31c61e4076cfe872b8a864d810251653bba6d46dae60a993168bb5d2f9eb8abbbcda86edeb71ce4d082ee58b4c5c40446457
DIST github.com-golang-tools-e531a2a1c15f94033f6fa87666caeb19a688175f.tar.gz 2246266 SHA256 0f0d14775ca548663ec4dacbed4bf5c95529289717b4d6576ff2b78d1177f534 SHA512 5cfaa76a4d5a8fb35c7c39dc2a9f323e1d5a61fe21819eaf89dffc5f033f4d18c0a65255bcd8b35699f6a39bfc7411dcb7a42af9a043dc5a72d81d36f69f8f58 WHIRLPOOL 217d3cb9b12733c55dc497a5c17a48e5f0c4d50dba1ec59ac919a7ade0a47077caf0eca30df42db30dfde4090c5385e1f67915a741a9f00711127614ce33a5f9
DIST github.com-gorilla-mux-18fca31550181693b3a834a15b74b564b3605876.tar.gz 29433 SHA256 f3fced6606c5e662aaef9d4cd71017438040af3ea419b3ac44dacf7c17dff91a SHA512 5bf7e9a6e8b01b235f5a9e697b5749d5655e62816d74b2173b123814f70aa92c5e0bc84cf40f643905354374efdcf1ffe8838d3a55d7e3abec29fd12a2e0239e WHIRLPOOL e4bca82d6c672290c5aa0683de5d81c787fcdfaf09bc2dd2ffd67f5e17c6cbbe829bb58b8e01861b692518550d4e8de359b7fcea175719e020e5ed31774806a4
DIST github.com-gorilla-mux-3f19343c7d9ce75569b952758bd236af94956061.tar.gz 30094 SHA256 db47181f2a79693d6441bf480ec4cc41f392b78681feadac5f68c6b61a728f73 SHA512 51d40186c3f216e27c487ea856d03047c89a21ed71819aaa8be366aa116e4227bd9db24293b7564ad5bd01799f275cf2d00f66cac9bf4162e9661c6ee91609d9 WHIRLPOOL 42dca254f258441c841bd681f1f60c1fb583ef787f26f5492dad83357cde4f63b9ba5b9d7b8e468a8cb31924a2e71d18376ecc8b15231c356461780f3a592a9b
-DIST github.com-gorilla-mux-ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz 29594 SHA256 8e3af8f0a839ae14d9267660758128cccd5b6ab16595de786961b297d5ee1ac7 SHA512 442e6249d273440eb5f31ca14b1ce4f702ca363ce385f34ed58189f96aac6a8f5314318cbbb61ff5376f1c6b660a81cd3f53948d79c081eb0c0d9e47657fb447 WHIRLPOOL 6af297833cece2d375da506b7b67b13761c12901da28c5ee63021fae50c4c55b72bd0d0ba70d265fbe2b8b747c7bff044a7bc57b7ec1ab990e5d373bd291465e
DIST github.com-gorilla-mux-bb285ea687c5c77bb6935fdb2402b121d8efcbec.tar.gz 30027 SHA256 ad86919422a108831e20551b67083c1c6c81d7fa2624779690c66bb5db2d6b3d SHA512 2aa87c84198dddd5e45dedda48ae6c885a9fc6e233d51ac275781a04a3ae6556d85b4c3255eb1e16e4ac7074eb4cedfd2a04d16ec785c5be24bf2548e1f379e7 WHIRLPOOL d5955dd449f5b314e0b203d1a4c4a3d164441506d6b54054fa35dc215d31392308378e84308b5ffc7dd91e1d58266d949a44acfb38c1c2f358b17d5f7c6fc89b
DIST github.com-gorilla-websocket-6f34763140ed8887aed6a044912009832b4733d7.tar.gz 42985 SHA256 456deca23b1bfa09f13bc2a57573ddc521552c4a5e7e677c4ff87c3aa206ade4 SHA512 aee494082f7d32a9c1d49c9975a8aaf9881ab57a917fc810f759ba79f038fadab564d2f6016a2f23a3f21798250a4b9a79cbeda600376eebdde2425d10bb77a3 WHIRLPOOL bf2a3343291e1bef424930638b717d47c5bd4d30addfb2f7d05e2f6cbb55277b42f84141c286c7f1dfe40b21b2dc776c58802f3a465c05355dd6933b1e41a4ec
DIST github.com-gorilla-websocket-a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz 42996 SHA256 b90c0b4117f2267a737b8573abbe139b706a6aa92257b346f6dd185d3135bde4 SHA512 95a107e3e8626bc17407b8ae14d8cf14b22be616a35e3a287aa9992bd952d0fd3e09668d8bd8e4af66bc7213dc2d1f0063c0c7edf7222a0e11423aba3a201d62 WHIRLPOOL 6a36def6799bcb77dab98c7a16818ab8db8c0c605c5fe9802c4026fa23cd7a761be55894c933e7683648af7177f9318b295d1b95c4510b0155a852c8356d9986
@@ -42,7 +35,6 @@ DIST github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.t
DIST github.com-jessevdk-go-flags-5695738f733662da3e9afc2283bba6f3c879002d.tar.gz 54989 SHA256 6a46bc8a692a1153b12a889b357683aa2aa2254d162ddb1c38253d7988cf1030 SHA512 9f117c43a41ee7b8753ba8bcb9ad49ad5106ce01b3be617921ed9d1208bd5bc1c4c155d797f2b1f7134955b16f3d82e46de2b0a45e5e8808199e0173687719b1 WHIRLPOOL c6f230afc0467fb6d76a2da9867e8437833471a7c36073d74834a5af399e8e6cfef0bd40bc5ae9cce4fad15c8b1d03b03110ee20c86ca4c281b5204f9e28e0fd
DIST github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz 55513 SHA256 c67846e5532a92d3ee629bc67eed7a12bfefe0b837182daef51ebb9774697d25 SHA512 cf4c45b2a0f314874dc4bd2cbedddfd6f46ed71d6b51198365db17d4a4fc6b2ecce000968b62d6c883f596bd8847f0429f3fbbfddb0ab7369a3a6b78d83c48c8 WHIRLPOOL 59be6ddb176a25cdbd0a48ed829259c49911e76c63f9f1f3a4027a0f4e0ed7c7ae39b7b3a99cc49fec99fcec6b4941ab066da9795eeee41a168c63f7e8425786
DIST github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz 16210 SHA256 eafa160a17919edabe61aed53ea7c129499ad9ee169134da8532b89c920d01d0 SHA512 04dfe2f155724d98c31fa2d274a13e77efc34364ffae172fffbc8e14b72f68a6301e6f582c1ff9f37cb105d11a7b3197e2ffa635f410ffb64d54e7c6fd1b9d1a WHIRLPOOL 76989d50938b01ecad8f0fee239a3e5bd4a829e8fa78a4f9b6d9e0711ebef5fef7d8786e28cfc03477017a4b5b2b5e4659c05f98d7239a4d5251878004d010ff
-DIST github.com-lxc-go-lxc-1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz 36338 SHA256 818389b46709ad9c248157d421219d2d04cc009ce43df6f173019e3d7dcf89df SHA512 92b69f1d6fe6dcbf67c4ec73be84dd066d6396c6f4be200ab3ec41654505870a94fe92c0d06d09c18c9ae634ee67377f79d6465b3640099409f25a6254fdae58 WHIRLPOOL 1e2b0b960a8f21e60455378dcc39f025e3dddee50a26c084cc2fc9eea506fe07a277c7a7810a273ade52378bed34acadc3f38563eebe4a4a81d7110c52ee660c
DIST github.com-lxc-go-lxc-89b06ca6fad6daea5a72a1f47e69e39716c46198.tar.gz 36894 SHA256 22bc63df7a27f2db7bf4e27bb286fe2a491f5b0d36ce02915fec7f6a63573537 SHA512 145168fb3defcc57785ae0b08d5386c098e6682fab2c48357a0e4dbdf4839ce1dc76a6818d77e620f542f452e31d075d817950a814c4e6d78781aae912587d96 WHIRLPOOL dccf7c2f88ca62f63e2ca86ca999cb50e9e34bd0680fe9eb53c068873304db94d91174a19d7a4f115bea63189146b1ae368631c58e198c7940db74616616cd1c
DIST github.com-lxc-go-lxc-de2c8bfd65a78752d6a70b4ad99114c6969363b0.tar.gz 36156 SHA256 7e794163a24488854f2ff48468e699577dcff82871717913cd7a079dc83d292c SHA512 57e84c66b8c8260e3d2631b37e5dabcaf5136e47ed4233489f8fd3b2cc8796c495dbc78390e4372b0cc54ee5920d1f469579f77de1c0291c3ae31dfd6b628dbb WHIRLPOOL 61e8d12211a0ea1eebaba824f4adc2784f26ed0c8496e74d51f02a7647f526954001ced5d3559bd2e2de8fa4c6ab76dd6d15cb8cbf678ec36db5613fcce9accb
DIST github.com-lxc-go-lxc-edfe59cec27b76afeb3b35c56f2948c27afac493.tar.gz 36344 SHA256 3c9f1a2ca36f10f08a5b4a5cddd4a17ac18dc6c85913e5e4e3b843e9b25ae40c SHA512 b21d17fad0ececf1d3d0e2bd4efedb11b976ef839de08f76cc0bf9c2fdc0490cd45d3ec3cf852726ba6cb1667e9d14f54a9b9b3f0a3a9bc471a90cf6eb531ab5 WHIRLPOOL 5ccb2839ad107ce84e336bbc1aeed31923d2bc09806a1c424a063b1fdfa8563b4fc7ec64b273126533d7a2ddcdda8d8165cc796aab8e157e86ae88d59af34ae4
@@ -51,7 +43,6 @@ DIST github.com-mattn-go-colorable-ded68f7a9561c023e790de24279db7ebf473ea80.tar.
DIST github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz 3262 SHA256 c013b75f090745e80bc5e3060a26d7053ebc63bd3d077177aa7a3e349bf151ca SHA512 8627d22f5ee5a087744bbf4dd391f8f87ebabe8940564206935dec9e406e40a98976479ea973e61afeb1774df211992cd61c67ee198d546e22fbf60826b64ac9 WHIRLPOOL be9969d0cca83428e9f6eadfffd970d95ae8c0562c00005303eb8122b2cd737410372458e2cd8e6328ff65536d5b7d6b60e34f94fac8cb4d582202dae4e0b94a
DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 SHA256 60afaf4d86f11a5d256d240cbccba766c5ef6ba2e695661df6bc4608021ca186 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70 WHIRLPOOL 5606a1879961eed55f00e3d7cfb21663db1d9f7059a586ea5a423f58655713a333d89ceb8dab328af0cea9d13e9dd02bde49bff6a086d80d571a03c79fc72ba8
DIST github.com-mattn-go-sqlite3-05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5.tar.gz 2030395 SHA256 6253685c0e7ae8141e4b9f07c6fff664edac80b75b8c09b39965f7603850512b SHA512 0899042c28f4dec19f830155d1da03830ddf6c03c96fc10190184f1ad2ed5eb2d69b5b989c40f489846201ba664ed80554f76a03c9e1e291d7fb9636967aba52 WHIRLPOOL 9c7867e45d0dbbc2b9865f0215b7c2b747cfc2c2e35264ca2bf96adaaa71b59374f301548ccb8cf34ff989fbc688e787dde2ce6de770962ef365b6ff6c5328ef
-DIST github.com-mattn-go-sqlite3-6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz 2028435 SHA256 650ece3ec45fe26df3879e3e67fc4e21f65547d441b4085f4910817dae54509e SHA512 743b713ff506517c05ea89fe744eebd5b67751305fc720459840ec6c2d0f2d1fff8437f668a38291b9686ecf940a5177c356c34e022fc020540e0f8c60a21ba8 WHIRLPOOL 840e78119db23b74a231d8f01c6f6a20ce5d5933aafa2dda9c2c1179c5f69f2c7e17fb59a5e5771252cc89b859bcc7ed32f777a5bf139f80e0fb6e026d9e2c6e
DIST github.com-mattn-go-sqlite3-83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz 2027317 SHA256 f108517a1ef06a51044a869f4da473b5e3f5f664afeaf4eeb9956c4bc2ad059c SHA512 687b1c9f7b2f27be4ef0d924f691f17251fb84522647436d3e6d1ba5946208618156663d817d146f954ea07d31619c446a3023f9a811f113a3761cda0daebdec WHIRLPOOL 26747056149e68ed1c9b59cfe5e1a6b0b38cdcd06a2d28ea68fef09085969dc1d706be70438552854c35096d3ce6405b6450da6fa5beae911da0e4b8730df8d0
DIST github.com-olekukonko-tablewriter-0fd34425a5aee40ff3f260b34e6c3b0d59f58c66.tar.gz 14765 SHA256 8e362aed0c169b6f0f1a1263aa7a04ec2208c70d0800a182706007b81ac02da2 SHA512 8006135ecba382466b8a283f1520ef052a909dacf7e4fc68f48549239675fc6225ee0382ef8008b051ac269eb827978dbd5a7e2391ad9f2cab99118189cf90f8 WHIRLPOOL 03c88724d658c62c5acc9d1b7016b891065789965955c9df02390e9eda94c6195b0e5c803152abe873cfcb3cd8d7f834890e8ed1d8a89922b03534ec9e603e51
DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 SHA256 a3f2a6f367b97d8406402a674eaf96c5ee9baab05de32b2031085b8d92e7eea1 SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929 WHIRLPOOL f43f7093b37580845a7e87fe487684d5ef5e51646413d9188e6e3895403a6e028f873c1fc52ae60cf9d677cc9c3d5373c6cb39cb05e3632172ff3827ae4f7064
@@ -63,6 +54,5 @@ DIST github.com-stretchr-testify-f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz
DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 SHA256 e63800ecdd704541bafcf8788d651a73599cdead61cd5bccedd31418c4fe58bc SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae WHIRLPOOL ec73f593f37d28565f9efe9b21d17175353b922e144842666b81163538b5d464dcdb4857897f5c1a4362fb44637490c3994f958498672fc31054539f2b5c64e3
DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz 9894 SHA256 1c90570f690a5b753633bce84097942021893f180c9d27c0b83f7a1bddaf59d9 SHA512 ee2de5568b76b87723e80e081e16094093f09a6be68dd0920793e007d4b705808ec1eac7a15b4c0ce7ed20aff04978f4ade264ab5bf5bdc5e2fdc46db2f4116c WHIRLPOOL ce1a13e5374248ffccaa613d399447d619ad94156f6ebf198d9e63019bd698496d67770ef520b802c59451ff9ad95d9fd789e8c9f758d1df553e2432c3b29289
DIST lxd-2.14.tar.gz 629982 SHA256 0ccf98257482458ff417c8af141a1f726fe7e696b7ab8b089ed1ee741280b2b8 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3 WHIRLPOOL 3483b15f7e09e8212fa5b646e5fc6be305b48e6cfcad5538ff9a4967820928b3f87931ca38fc4787ecab67216d2c876476880551ce56e3ed0c080a7b769e2823
-DIST lxd-2.16.tar.gz 707146 SHA256 16d4b09f132f628dbacaa192c02ae27baf91a20a57e26cfea2a24b5af6077680 SHA512 63a870f3613f3e7e917bd06bc748d143586af543901cd4e2159015cb2f20fdf40ba7f04971d6dee2e8a5afd60fc1476cef29783ab5ec5e531c35360fdf83e70f WHIRLPOOL 74b8cdd09801840d87e81317e03d153afab833fff4b58efaf58c7c49703d447fd42d08892b83ef3f18635bdb61ebac0df1651ca99eb3d98710b032283b941b5f
DIST lxd-2.17.tar.gz 703925 SHA256 e50da1ffd5c8c1758266ea193b68563dad57b0141adeb17f1a190c9b2c117d0d SHA512 4d2e2bdfb92c08025bf360b8b655300c0c01f3e249bab98b1d346daa6f995c638cbd0b6c48bcbb26c18c875de1ed223afe4b4004fe4c5589715779d53646be0d WHIRLPOOL d5afd3e3a6eb620aaf2b01b31fe918c36397b692df8c8df0b9140cd2a0fdeedda0aa1b495e8c35d4ebb986dbb354481f76a5e1b1cec76b2a7e7a0ab15cc234fc
DIST lxd-2.18.tar.gz 725957 SHA256 2ae07f56b451ffe78718aeb56b6016c8708b1ed8f1ac79dd9bb6a8916019fc22 SHA512 51116a41c4c13c85729e36047a9c36a997fb79abd383ecf2490be3160a39b90b05042aa0f4c979849c255b9630b03ed2c7acb92c26aed3c20aacce65ef0c70c5 WHIRLPOOL b34eb8f0fd8dc1690df4cf730258c30410f3959e31e6aaebdcddb499c47cdee9fd77dc3319ed9821e5368fa35360d8d9f6d3777c596124f7563e842efa157fbb
diff --git a/app-emulation/lxd/files/lxd-2.16-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.16-dont-go-get.patch
deleted file mode 100644
index a6e25e325b9..00000000000
--- a/app-emulation/lxd/files/lxd-2.16-dont-go-get.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- /src/github.com/lxc/lxd/Makefile.orig 2016-07-11 23:34:40.299664675 +0000
-+++ /src/github.com/lxc/lxd/Makefile 2016-07-11 23:37:00.816018727 +0000
-@@ -13,13 +13,11 @@
-
- .PHONY: default
- default:
-- go get -t -v -d ./...
- go install -v $(TAGS) $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- go get -t -v -d ./...
- go install -v $(TAGS) $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.16.confd b/app-emulation/lxd/files/lxd-2.16.confd
deleted file mode 100644
index 3d553276a5e..00000000000
--- a/app-emulation/lxd/files/lxd-2.16.confd
+++ /dev/null
@@ -1,27 +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"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.16.initd b/app-emulation/lxd/files/lxd-2.16.initd
deleted file mode 100644
index 51c8e7e0655..00000000000
--- a/app-emulation/lxd/files/lxd-2.16.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-2.16.service b/app-emulation/lxd/files/lxd-2.16.service
deleted file mode 100644
index d00635fbcdd..00000000000
--- a/app-emulation/lxd/files/lxd-2.16.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Container hypervisor based on LXC
-
-[Service]
-ExecStart=/usr/sbin/lxd --group lxd
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/lxd/lxd-2.16.ebuild b/app-emulation/lxd/lxd-2.16.ebuild
deleted file mode 100644
index 17d8d477ef3..00000000000
--- a/app-emulation/lxd/lxd-2.16.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2017 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/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-
-# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
-EGO_VENDOR=(
- "github.com/dustinkirkland/golang-petname 1f4996aa8aa05ee066aaf9e3179d340b48c6da74"
- "github.com/golang/protobuf ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e"
- "github.com/gorilla/mux ac112f7d75a0714af1bd86ab17749b31f7809640"
- "github.com/gorilla/websocket a69d9f6de432e2c6b296a947d8a5ee88f68522cf"
- "github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
- "github.com/jessevdk/go-flags 6cf8f02b4ae8ba723ddc64dcfd403e530c06d927"
- "github.com/mattn/go-colorable ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b"
- "github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
- "github.com/mattn/go-sqlite3 6654e412c3c7eabb310d920cf73a2102dbf8c632"
- "github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387"
- "github.com/pborman/uuid e790cca94e6cc75c7064b1332e63811d4aae1a53"
- "github.com/stretchr/testify 890a5c3458b43e6104ff5da8dfa139d013d77544"
- "github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
- "github.com/go-stack/stack 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
- "github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe"
- "github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
- "golang.org/x/crypto b176d7def5d71bdd214203491f89843ed217f420 github.com/golang/crypto"
- "golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
- "golang.org/x/sync f52d1811a62927559de87708c8913c1650ce4f26 github.com/golang/sync"
- "golang.org/x/text e56139fd9c5bc7244c76116c68e500765bb6db6b github.com/golang/text"
- "golang.org/x/tools 84a35ef54dff3c5596983e180ec10919fc432242 github.com/golang/tools"
- "golang.org/x/sys 9f7170bcd8e9f4d3691c06401119c46a769a1e03 github.com/golang/sys"
- "gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
- "gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2"
- "gopkg.in/inconshreveable/log15.v2 b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f github.com/inconshreveable/log15"
- "gopkg.in/lxc/go-lxc.v2 1a2cf29ce27f74298fe70acbf817ca2f46cf7457 github.com/lxc/go-lxc"
- "gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
- "gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml"
-)
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+daemon nls test"
-
-inherit bash-completion-r1 golang-build linux-info systemd user golang-vcs-snapshot
-
-SRC_URI="${ARCHIVE_URI}
- ${EGO_VENDOR_URI}"
-
-DEPEND="
- >=dev-lang/go-1.7.1
- dev-libs/protobuf
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-arch/xz-utils
- >=app-emulation/lxc-2.0.7[seccomp]
- net-dns/dnsmasq[dhcp,ipv6]
- net-misc/rsync[xattr]
- sys-apps/iproute2[ipv6]
- 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"
-
-PATCHES=(
- "${FILESDIR}/${P}-dont-go-get.patch"
-)
-
-src_prepare() {
- default_src_prepare
-
- # Examples in go-lxc make our build fail.
- rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
-}
-
-src_compile() {
- export GOPATH="${S}"
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- emake
- else
- # build client tool
- emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}" || die "can't cd into ${S}"
- dobin bin/lxc
- if use daemon; then
- dosbin bin/lxd
- dobin bin/fuidshift
- fi
-
- cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
-
- if use nls; then
- domo po/*.mo
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_newunit "${FILESDIR}"/${P}.service ${PN}.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md doc/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
- einfo
- einfo "Networks with bridge.mode=fan are unsupported due to requiring"
- einfo "a patched kernel and iproute2."
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2017-09-24 11:18 Agostino Sarubbo
0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2017-09-24 11:18 UTC (permalink / raw
To: gentoo-commits
commit: ed33158c34c84438fd698cf18450af9236a4eff2
Author: Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
AuthorDate: Sat Sep 23 13:09:28 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 11:17:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed33158c
app-emulation/lxd: bump to v2.18
Package-Manager: Portage-2.3.8, Repoman-2.3.1
app-emulation/lxd/Manifest | 12 ++
app-emulation/lxd/files/lxd-2.18-dont-go-get.patch | 16 ++
app-emulation/lxd/files/lxd-2.18.confd | 27 +++
app-emulation/lxd/files/lxd-2.18.initd | 46 +++++
app-emulation/lxd/files/lxd-2.18.service | 10 +
app-emulation/lxd/lxd-2.18.ebuild | 204 +++++++++++++++++++++
6 files changed, 315 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index dfb6633c8a0..6e4dd01ad85 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,31 +1,40 @@
DIST github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz 15087 SHA256 727e3b7d4ed0df94b96c99ca69c3505303d4f93173c31b5afce20e6813d6a270 SHA512 7f2d849104993e089aac6abc01844a559239110fbe257469ee918de26ef6d77cc29027324204b38613346c6f0579afc66bd721f56c2c2062354ac31f4e7fd7e3 WHIRLPOOL 857821556293492db1bd1cfbaf6c376846a94e6a13d0c021051827e4be0defdafe4b0c81f4823620b619d04a9fdea077341376d9f4665964475ecd092aa9b343
+DIST github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz 15127 SHA256 9fd221710230927063fe8380d9986d4225e9f69a8dd049c678020f7c75ce9dea SHA512 0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d WHIRLPOOL d7a223573dc16d445e1f197b576a18f0682d2c3bffb07f34b4c8ef764070c2d234c3bb2935109c05ea975fb0d719a44c1653f14a5234c791f67d8c6748897c41
DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 59915 SHA256 f80d8b1dd92d7f2ea4b48d2e4b20d726156d0920e90ae0d6e8ac540a0d156ba3 SHA512 c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee WHIRLPOOL e2a011888949ecdf0ecbce662ea30de731ce7393142d06b9a0116ebdbf46771dde7be89067785663ed93cc45bdc861122112cf8c3b8f6fa27018c0a100066b0a
DIST github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz 30367 SHA256 297ad610c697f409ae1fa434f09da1ba6acdf3bbfcdbe8079dc4b6a6668c12f0 SHA512 94342de3aad4db1c4442062f4cf4e57c723a43bbcb0069a8bed3b719e3864eef7500a24c9c99c755114708d6822e9b23f296b6d0b2b46f32cc6ffc65944d1729 WHIRLPOOL d3341fccb03237d8352c305ca1067449c0e00cc59297f9b14c98f38f2f6d463820469e6f13641dd5341ccc3d07a731b7436ed1a8eb3666e37a79e6447d336c1c
DIST github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz 6476 SHA256 2c03218436fdcebe9e9fd970055155a543ae06eb5a2c631911e2bc358fe52c58 SHA512 cbbdd7066249a571cc4d052e7907150f575e18c078078199b18f7557e3b12fc7c6969e6fe55773c951f3f954d296707d9e4c74ce26e3b6f408263774b0315a52 WHIRLPOOL 9829d90b0be2ab4b522ac6b95295627877229ba6db1055b9c33ddf404a2d02922837056096ac3a287353edbcddb14966ddb89f160e95c2aff46bc0e758419329
DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 SHA256 2379edcc225238167aa0d45cb28d3561c5193979b136a6cf3443a1fe3b85c78a SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d WHIRLPOOL fc39214f5e5d7063069f7173bfea57483d3a8f46c586c704d93a9af1ebb534493de343a9f2dbbd51eb22de118db2f0e3e9838ee4df2c414d2921545f2ed3ed7f
DIST github.com-go-yaml-yaml-cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz 60805 SHA256 11a6ce686bb70ab92020f2dffadc2e024e267a6564a62b0091e2974474c7f88d SHA512 268498022f34c4b59b5b75443ee10fd4273203f4b77bfa11b08a792c004cf13e3010c34b4c15cee2b4e7f3c910648d9897700f60ab00b327d78c49e97497fe2b WHIRLPOOL b2d18dc7354fa6e4819c2b1437e3dce55212fbf6e907361b82bfefc0b2306f12cbf70560c3819e2a81426e538949f05be01c6b8b3f3e53a3aa6daf828e95d537
DIST github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz 64789 SHA256 2f35fb36301bdee6afa5d7ec41c8870bca370ee8300b4da157ee3336812b5c36 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289 WHIRLPOOL 27c9123a8be869dbe6a15d1e69e39d511f44624fffd89aac37bf0e59c5d30f2b7932c6015fa055f3ffed9357873a2fb92c1f6522793a64b752722cd539bc2089
+DIST github.com-golang-crypto-7d9177d70076375b9a59c8fde23d52d9c4a7ecd5.tar.gz 1432665 SHA256 238c9ed9693ada60d89b1aea20007dcc1d29754ea25b537e3b9de6188151270d SHA512 d107abb176bf37a0a5a2487cb00b5d12e2247d41524a0651860c0a0b41b2b80926af024b78cc12aacafe254a1b8245980ab219a8357c8c2e17e9245f9027e570 WHIRLPOOL d448afb23308a8f7ea42b8bdec8ae182a7bff335800f91cd3c8e7398de87b4a30c71ac6083d8dee548a64db35f8158649420cc562a94ac9e4871e81dade404e4
DIST github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz 1431151 SHA256 0dc71491c29f8a217fadbced9ed7d9216f361b6d0fb09dfd030e6fe116e83be0 SHA512 ff5eaf61e7dc133a56a90d100c4b48fd2775145b457febdd1eb9ec39c15ce6bc73665873bbe658d6b4bb94a008d7246317d751a41b5a62b43d2055ed3cb01e02 WHIRLPOOL 3289466f54fb998d4ecc7b757a24e4f7aef88b29e16df75a0e47b5dcb84594462508161d06589a13099df72afa12b90b701efa412cbb352cb21f282b20c6361c
DIST github.com-golang-crypto-b176d7def5d71bdd214203491f89843ed217f420.tar.gz 1431191 SHA256 9a7d565a11c3bb0aa78156c3ab6c6d55c2c8ff9e0d7733574b7f2e67fef03ebf SHA512 6cae1da26b6d46c4f080f74b574f5b7d7e1e86eeb83532e19f42e6e098e9f6d0b113cd07e66f43806ace738583262e37cbb7dc229f8d61ad16a5f86372eb539a WHIRLPOOL b2a1b6d19ee5d72e4b38b403bc3142385d543c713fb4729333e1614b114fb81789a4c94974811f67e3c61c0f03aa8f3fc91e61558d85eb507a7812d43052b7e8
DIST github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz 1336856 SHA256 28950420102f0dc290b84a52f06bc5b12a0a2b411b1b4fe216ba4ffe3ec3754e SHA512 c22fc86fbc22d6ec8157f89c075f07db8b72bf63ff97e06c907f555bf865cb77414c4fa2b9974407e43fa4f74b77710d3be9d2646f929fcfd5269b0ffc379914 WHIRLPOOL c85d338f87f5c418009497308ba28bd805769cb5350835dca35f77cce7ce456afe9cbcd66d9db3aea77e3eab0ed228260f7ec2e6825632624d9c80556ed15fbf
+DIST github.com-golang-net-0744d001aa8470aaa53df28d32e5ceeb8af9bd70.tar.gz 920361 SHA256 03f6f00d1142924dfee5abd67e6a39801a1da5c9f372a122aaaaf3c65de58a39 SHA512 d308b4f872612287c29b815b6ac0c4c3efbda4c641940ed8553851b1e93c6654bf443367b5ec96166d68fc2759d7e90e46fd6f148f0a6d535bf057bb785627d7 WHIRLPOOL 3d058a51d06992f8c07640f2ff6e69c5a0c468251420857b26da30fb6dc9b15f169321a7a4a29849aa6f346122339a0758875d6afd31d8d85a0cf3be8bb481f2
DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 SHA256 37d0bf101e8fc7e1dd8f1aa83ef106befe02fef11dc6a12ea1f7cebdf1a160e1 SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c WHIRLPOOL d344671f614f0d43a313d1409ba20cad711bf8d3be7b0c52e6d2a7db0a3efbd17369cea70136a095522122a3cbaada7de4d79e2f7ad784b9e7fd8e46d54ec443
DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 SHA256 5140f8089da711f07bcdffd50b262cc9a6d53dc4c2ebeffd5bd6ef04d103775b SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3 WHIRLPOOL b48dd92edf0ce8cb27b57132a888b0f7ac2b7b844f62aebe072e5fa3beb9921a409c547c6fd2701f1f4ba68a580e8c5988d915cc8cbeaee62356399d3848f2f6
DIST github.com-golang-net-e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz 899910 SHA256 a92f1314f40ff6e542ac6e6ea1346cefcfc74e5e5de4939a1baa67c4f86a482b SHA512 0a582e9aa0ecee1c881771715970129d8af5975cccbb797f1e2eeeea7989b17448b26c000ef49fc7a1ae02eddebdfbc52dd2cd9a82b0b3b667b4ee7f62346052 WHIRLPOOL bdd305498d35c9ef3f1eb34878976e165117ec1c9d1eca8a28cb06a4616d54733e4e2504143990d0e74c6901bd5d6f717e2a0132fd0c4f74fdc305c7d983256d
+DIST github.com-golang-protobuf-130e6b02ab059e7b717a096f397c5b60111cae74.tar.gz 268449 SHA256 b9d3381955d095b8c4b26d0464f87e3b32f65fee51c2f791338bcdfea21a1ad8 SHA512 3caefc21de9d57ee484e32d831997efe1e086af652fbbff210c2097db03f933be78446ceea9d004200939b6d48737d716fae0674e1e142179e8ccd1827f3a228 WHIRLPOOL 0155a8e9cd779b1d636edad7b95bd8064b179aaa4139d722e1e423eece8be5cc462a9feed4bc1134b1530d2b04b336cd363c5b5cdc24c8caac707d3c20e06bda
DIST github.com-golang-protobuf-17ce1425424ab154092bbb43af630bd647f3bb0d.tar.gz 266836 SHA256 3f82e7552c325c68b728c17f5b7ebfed200ca376c39353abc2f896756e2291dd SHA512 e6f093a5a8231e8e51daa2c5adf1db8da9dbeddc42fb6d05cd1f0cc03e2f3c1a65647b5463f3d71d94361d8a31163ee4fcc32e57a3e2df9e0a557c06469d88a8 WHIRLPOOL a08ee48e3e9c18aa420d4f15aaa7a1b957e1be12b3db14805904a1e55eb832db4eca830c07ce39f9915a455b4269c63ef4c8cea2f3fd8d84f45dba3c05d4bc66
DIST github.com-golang-protobuf-5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz 252930 SHA256 0f5d73fa192983fd67d0aa6b9f6e0c5fa64a966bfda42f7f4ffbd83163adf02b SHA512 ac284034ee27b275df8adb83ecf4eb85977cc9cf5266384a080df2beb2fdcb84af7e166cabaf76881b95eab4812997ab435adf0abd6068ed967f609b1747b6a7 WHIRLPOOL 87685c46c8813b8d4882aadb0b37437782f509efd8e59068f524cd100e11693bce0939087b923acd5214a14edcf76cf0ad71636ff634989d6c9dd5b02667ecfa
DIST github.com-golang-protobuf-ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz 265243 SHA256 25454663aa8e0cf17f0bf273ce0e07703b75aadff9268707228fc76581b7d91e SHA512 25618656838aa0b20f5a4da59fa126d339fe8825a8cdea46ecbd05831751c3fbb86e496fc0930a38faf18760ebece510b505a2aae9b29ab659a081a02005099b WHIRLPOOL e61468e817d5ee34326ce795dd841922a00edc1ba5eb502a59fe095e100eee6273531823474f87b744a36007871a720d4312df921a1ccb9f30fedf986768c4cf
DIST github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz 15326 SHA256 25b869d922114e49906f2d9559c86b23b54f753986e58546d4ad816f426a9ad2 SHA512 912a5afe25c6854e14d72d9d0a897808ab9b67ba4f8428cd04fe7bb3ca815f1bd1b78667587fcd74967f88f44ea591b77616955dd130cc2f98eea922fdbacf61 WHIRLPOOL 91c3b07b66c56b0bce5f430f5e0573d30f57ebf83204cfcbadea5a88607f843c8176eadc2ebdae6020b4bc1144b9ae45ba03fb00c12070faa7505e4726f6b2e1
+DIST github.com-golang-sys-429f518978ab01db8bb6f44b66785088e7fba58b.tar.gz 769610 SHA256 62f47292c34506c5208b8fddab5e6c61ce65a557f5a2b167ba5953eb981fac15 SHA512 d3713f07cabdd7d25516a25ef4428de9bb5384970c28706887a952bc73fa7f99e6cb2b3a057195670b29fe447dffb3796e23e4863d5e28778609a799dffc1347 WHIRLPOOL 4e27190805038fa0ba24a1b01c194d239bdebde7036a48985cb0905705e042558c5067175df96b7852df1de8ebe89c4ea1e0645d0b0bd8b33aaeedc7156c4f2d
DIST github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz 766292 SHA256 cb5b32b2d95a724f52104bcf9b9c2afa85b5d3eba0e31ec6cedb7381c90d26a2 SHA512 8d35c2b54cebae7f0f21916dd72be6132c22402829830f7b34805338f81e96da61977b346b72aadecec72c5eb1560998c7523fe0e6828813d635e06cf230934d WHIRLPOOL 8e2213c8dcb39d943ad77e7667d58afa26f550b7208103968a227b4e99d05f9a3e5767fa0c4f4b9198e6e113479505a32bc8d01eba67e06cf5e3b35e9edb1939
DIST github.com-golang-sys-9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz 756878 SHA256 71c6138054b6ab517392e4f943183a12acf51c1abd9d4d1927563ffbdbf60812 SHA512 b1caae99c1575e588801e63775da86133f3f4f8380eddb148b9d38b34b21a20e1ad2e050c7a19bc7e1c77f5b450cafe67c06682d4cd4e7f7905f050f9f3cbabd WHIRLPOOL eadb6c57c7f82a684499d691874ae2e3bee7cbbef1a58f3cffdcee3f63fe5a7b0038ec12546283bfda575cdf99dc615be18bf4bdf4641800ed1dccfec8d3a044
+DIST github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz 4624392 SHA256 4a125a94d8cf95b12783cc29b13fbb821d9e06a5fce2122b1920e81d4ca63bda SHA512 c37cc66e33e89d23a2fa4b707589316f9e28fe1d7131bb6208c0dcbd514f879dfff78328b871eb6d3ea1610f8b3f1d8c3061d94f88bc658d7bd8df2a19851c45 WHIRLPOOL f2f3c0498056de625a0e3d33e6cee84723b2934ae788512ef43e119be22bfc437fa590eea2ea3dbb5d14bdb3769adad59910c320f900d8763a8a1cf5b4078f41
DIST github.com-golang-text-bd91bbf73e9a4a801adbfb97133c992678533126.tar.gz 4610285 SHA256 650d045a890228f43211a2df5bc254d9cc80723bcc6ecf61fb9df2e81c75d35b SHA512 a57f839fef4b7fe086b4238c38396d3ead49be20674899cfef8d723028e9dbd7ccc8fe8b76a84d53137b7cea26aaa594e68b9cd7b0a2816fae71f5c3ad15ec13 WHIRLPOOL fe6bcbfb389a8041f28fefec9b65c71fba8c6025a71a82ed8325664b8870da5ca6e4a021c6d144a36d08775925ee77575096d4a7c50dd407b4b2d85fa0c392df
DIST github.com-golang-text-ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz 4549711 SHA256 5bdfdcc6c259710ca398c1b6da7967d18dcdb8c6aaa56501da3f0333767d38ce SHA512 78941350134b98f0dd72b0397796106b309cc50e34d0741bb1b4e8795a653f6364e35061b1f36def969ab81a2b07ef80fa135baca3054116d58358d53dea282b WHIRLPOOL 870f029b29ed47881a1fbc71f4e903c43c215a56b0ce635956be6ef13fa4f379a793cfbd2dd9b70b031425245d5b3afbc84bb789fee7a2502575c472c0f3e0ba
DIST github.com-golang-text-e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz 4604834 SHA256 17b5549b3463ad5f4adb10036294a521601de2c9d5e7bca946fef909b859c2a6 SHA512 26dd6fcf2c9e589f1fcdeef0197c0db12ddb2b3f526c1992b76954fde826aa01f86bf485ffefc312d9cfedd793d185475bb5d84c951e02e8df7586f0c6269749 WHIRLPOOL 9412e8790334e7558c3083f487aa257a38295ed325c183bfaca0b4d09c081353e368732d336808c32cdae9c0f183e4bfc8d90bdaa71aaeeb6c1c66b029c4ce10
DIST github.com-golang-tools-2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz 2224136 SHA256 33d0524e2173a3d1292ad2a280230c39bd3b4def2eccad5d4a058b5cb29a4c12 SHA512 dc36f88d348ae5c299c4909120caecab35964dbb85529e6e735bd507155173ab86b134cd39a1fdfc50b7f1f55345175604f29027b0b3e1acd7f3b312303aef70 WHIRLPOOL 7ef8bd2853654c99a9b38d3ea14418ea28834824392a67cc93513682ce260b15d970343773982e31e2b65029c19ffb6f562cf46f4b69b4a3e41acfdd525fc79d
DIST github.com-golang-tools-3b1faeda9afbcba128c2d794b38ffe7982141139.tar.gz 2246286 SHA256 a9437023d0c7cc757cec3ab76abea815e424174698d3bfd1160ba3c82a6729a1 SHA512 d36353fcfb96947a5f50b768e19bba6a075d71e0bec2bb3103869ba33e023de9a0163b127ae303c9e4ed8b3226c831d63a6eb8cdbfdb4b7d17bbd9e86616497c WHIRLPOOL d2636f80821f770e43565470b2af306bf237fa55d8a2d0c25c97ca5341499ee7f2e7245bcf799209d5eb72f12e9b8d7d2249305a2145de940c0fecc6aabf4854
DIST github.com-golang-tools-84a35ef54dff3c5596983e180ec10919fc432242.tar.gz 2244664 SHA256 26436026e569cc2f9ef07c11eab48ecfba2a11966fc5ddf2e534be29235031b1 SHA512 df4621cda50f01542eb4cb106bff05680137f21b91b5524348a72aec0682e547724183e698621e573e34622c45031f54a071181941be168aabe96dc52d6931a5 WHIRLPOOL f407a1280e81e88a12869fe22a1e31c61e4076cfe872b8a864d810251653bba6d46dae60a993168bb5d2f9eb8abbbcda86edeb71ce4d082ee58b4c5c40446457
+DIST github.com-golang-tools-e531a2a1c15f94033f6fa87666caeb19a688175f.tar.gz 2246266 SHA256 0f0d14775ca548663ec4dacbed4bf5c95529289717b4d6576ff2b78d1177f534 SHA512 5cfaa76a4d5a8fb35c7c39dc2a9f323e1d5a61fe21819eaf89dffc5f033f4d18c0a65255bcd8b35699f6a39bfc7411dcb7a42af9a043dc5a72d81d36f69f8f58 WHIRLPOOL 217d3cb9b12733c55dc497a5c17a48e5f0c4d50dba1ec59ac919a7ade0a47077caf0eca30df42db30dfde4090c5385e1f67915a741a9f00711127614ce33a5f9
DIST github.com-gorilla-mux-18fca31550181693b3a834a15b74b564b3605876.tar.gz 29433 SHA256 f3fced6606c5e662aaef9d4cd71017438040af3ea419b3ac44dacf7c17dff91a SHA512 5bf7e9a6e8b01b235f5a9e697b5749d5655e62816d74b2173b123814f70aa92c5e0bc84cf40f643905354374efdcf1ffe8838d3a55d7e3abec29fd12a2e0239e WHIRLPOOL e4bca82d6c672290c5aa0683de5d81c787fcdfaf09bc2dd2ffd67f5e17c6cbbe829bb58b8e01861b692518550d4e8de359b7fcea175719e020e5ed31774806a4
+DIST github.com-gorilla-mux-3f19343c7d9ce75569b952758bd236af94956061.tar.gz 30094 SHA256 db47181f2a79693d6441bf480ec4cc41f392b78681feadac5f68c6b61a728f73 SHA512 51d40186c3f216e27c487ea856d03047c89a21ed71819aaa8be366aa116e4227bd9db24293b7564ad5bd01799f275cf2d00f66cac9bf4162e9661c6ee91609d9 WHIRLPOOL 42dca254f258441c841bd681f1f60c1fb583ef787f26f5492dad83357cde4f63b9ba5b9d7b8e468a8cb31924a2e71d18376ecc8b15231c356461780f3a592a9b
DIST github.com-gorilla-mux-ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz 29594 SHA256 8e3af8f0a839ae14d9267660758128cccd5b6ab16595de786961b297d5ee1ac7 SHA512 442e6249d273440eb5f31ca14b1ce4f702ca363ce385f34ed58189f96aac6a8f5314318cbbb61ff5376f1c6b660a81cd3f53948d79c081eb0c0d9e47657fb447 WHIRLPOOL 6af297833cece2d375da506b7b67b13761c12901da28c5ee63021fae50c4c55b72bd0d0ba70d265fbe2b8b747c7bff044a7bc57b7ec1ab990e5d373bd291465e
DIST github.com-gorilla-mux-bb285ea687c5c77bb6935fdb2402b121d8efcbec.tar.gz 30027 SHA256 ad86919422a108831e20551b67083c1c6c81d7fa2624779690c66bb5db2d6b3d SHA512 2aa87c84198dddd5e45dedda48ae6c885a9fc6e233d51ac275781a04a3ae6556d85b4c3255eb1e16e4ac7074eb4cedfd2a04d16ec785c5be24bf2548e1f379e7 WHIRLPOOL d5955dd449f5b314e0b203d1a4c4a3d164441506d6b54054fa35dc215d31392308378e84308b5ffc7dd91e1d58266d949a44acfb38c1c2f358b17d5f7c6fc89b
+DIST github.com-gorilla-websocket-6f34763140ed8887aed6a044912009832b4733d7.tar.gz 42985 SHA256 456deca23b1bfa09f13bc2a57573ddc521552c4a5e7e677c4ff87c3aa206ade4 SHA512 aee494082f7d32a9c1d49c9975a8aaf9881ab57a917fc810f759ba79f038fadab564d2f6016a2f23a3f21798250a4b9a79cbeda600376eebdde2425d10bb77a3 WHIRLPOOL bf2a3343291e1bef424930638b717d47c5bd4d30addfb2f7d05e2f6cbb55277b42f84141c286c7f1dfe40b21b2dc776c58802f3a465c05355dd6933b1e41a4ec
DIST github.com-gorilla-websocket-a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz 42996 SHA256 b90c0b4117f2267a737b8573abbe139b706a6aa92257b346f6dd185d3135bde4 SHA512 95a107e3e8626bc17407b8ae14d8cf14b22be616a35e3a287aa9992bd952d0fd3e09668d8bd8e4af66bc7213dc2d1f0063c0c7edf7222a0e11423aba3a201d62 WHIRLPOOL 6a36def6799bcb77dab98c7a16818ab8db8c0c605c5fe9802c4026fa23cd7a761be55894c933e7683648af7177f9318b295d1b95c4510b0155a852c8356d9986
DIST github.com-gorilla-websocket-a91eba7f97777409bc2c443f5534d41dd20c5720.tar.gz 42927 SHA256 56858a67bb8b462f496e9b9795436824036ae17cc3a540284a4183a4c9ca3dcb SHA512 651d017498aca3fed375996a4cd77a5128396a14aaca4485e5480937f85d1ea8a734ec607d1658601ec6eb9b0b1e9a4756a0264c4dd86ac6bf2de556daa6693c WHIRLPOOL 5f1181de9500b03fde03f6ff8406a65987e60eb7018bd76defa3065c85e6b1d79f674024aeb000d0cb5a0bada96b6d757a82edce203bb8ff0d1c79a176868783
DIST github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz 9682 SHA256 23e121b4ea15818e26d840cba571fb1c165b785271b07f44d3b575e17070fc1a SHA512 99a00ecfeb4226bba01dbef615f02b22f54959252c9fb99ed55f8c040026305fa54256f78eceb5c02ac6a77842c72fda43d1790590adfdcf3202095ad836a198 WHIRLPOOL 0e3c101756336766d38a5a8d80349b55378456f6241ee53a873edf5a23e44f557dc1125c12892aef6a5fa70797da47f1ab72b0f5acb4502c10aa2be8d6c1aaf4
@@ -34,6 +43,7 @@ DIST github.com-jessevdk-go-flags-5695738f733662da3e9afc2283bba6f3c879002d.tar.g
DIST github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz 55513 SHA256 c67846e5532a92d3ee629bc67eed7a12bfefe0b837182daef51ebb9774697d25 SHA512 cf4c45b2a0f314874dc4bd2cbedddfd6f46ed71d6b51198365db17d4a4fc6b2ecce000968b62d6c883f596bd8847f0429f3fbbfddb0ab7369a3a6b78d83c48c8 WHIRLPOOL 59be6ddb176a25cdbd0a48ed829259c49911e76c63f9f1f3a4027a0f4e0ed7c7ae39b7b3a99cc49fec99fcec6b4941ab066da9795eeee41a168c63f7e8425786
DIST github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz 16210 SHA256 eafa160a17919edabe61aed53ea7c129499ad9ee169134da8532b89c920d01d0 SHA512 04dfe2f155724d98c31fa2d274a13e77efc34364ffae172fffbc8e14b72f68a6301e6f582c1ff9f37cb105d11a7b3197e2ffa635f410ffb64d54e7c6fd1b9d1a WHIRLPOOL 76989d50938b01ecad8f0fee239a3e5bd4a829e8fa78a4f9b6d9e0711ebef5fef7d8786e28cfc03477017a4b5b2b5e4659c05f98d7239a4d5251878004d010ff
DIST github.com-lxc-go-lxc-1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz 36338 SHA256 818389b46709ad9c248157d421219d2d04cc009ce43df6f173019e3d7dcf89df SHA512 92b69f1d6fe6dcbf67c4ec73be84dd066d6396c6f4be200ab3ec41654505870a94fe92c0d06d09c18c9ae634ee67377f79d6465b3640099409f25a6254fdae58 WHIRLPOOL 1e2b0b960a8f21e60455378dcc39f025e3dddee50a26c084cc2fc9eea506fe07a277c7a7810a273ade52378bed34acadc3f38563eebe4a4a81d7110c52ee660c
+DIST github.com-lxc-go-lxc-89b06ca6fad6daea5a72a1f47e69e39716c46198.tar.gz 36894 SHA256 22bc63df7a27f2db7bf4e27bb286fe2a491f5b0d36ce02915fec7f6a63573537 SHA512 145168fb3defcc57785ae0b08d5386c098e6682fab2c48357a0e4dbdf4839ce1dc76a6818d77e620f542f452e31d075d817950a814c4e6d78781aae912587d96 WHIRLPOOL dccf7c2f88ca62f63e2ca86ca999cb50e9e34bd0680fe9eb53c068873304db94d91174a19d7a4f115bea63189146b1ae368631c58e198c7940db74616616cd1c
DIST github.com-lxc-go-lxc-de2c8bfd65a78752d6a70b4ad99114c6969363b0.tar.gz 36156 SHA256 7e794163a24488854f2ff48468e699577dcff82871717913cd7a079dc83d292c SHA512 57e84c66b8c8260e3d2631b37e5dabcaf5136e47ed4233489f8fd3b2cc8796c495dbc78390e4372b0cc54ee5920d1f469579f77de1c0291c3ae31dfd6b628dbb WHIRLPOOL 61e8d12211a0ea1eebaba824f4adc2784f26ed0c8496e74d51f02a7647f526954001ced5d3559bd2e2de8fa4c6ab76dd6d15cb8cbf678ec36db5613fcce9accb
DIST github.com-lxc-go-lxc-edfe59cec27b76afeb3b35c56f2948c27afac493.tar.gz 36344 SHA256 3c9f1a2ca36f10f08a5b4a5cddd4a17ac18dc6c85913e5e4e3b843e9b25ae40c SHA512 b21d17fad0ececf1d3d0e2bd4efedb11b976ef839de08f76cc0bf9c2fdc0490cd45d3ec3cf852726ba6cb1667e9d14f54a9b9b3f0a3a9bc471a90cf6eb531ab5 WHIRLPOOL 5ccb2839ad107ce84e336bbc1aeed31923d2bc09806a1c424a063b1fdfa8563b4fc7ec64b273126533d7a2ddcdda8d8165cc796aab8e157e86ae88d59af34ae4
DIST github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz 8089 SHA256 ad1e8de71cee50acb8492bcaa9b1a7d0ebe175f76266a8f3dd4d7fb48d8e53be SHA512 0f458e6acfec266b58cd458bd05bc04617df0ef223ffa6a6c374decd29555a78441f3a17df7b5f782d96a25f56bcece061407e9778e25ceafeedafa014a45bb4 WHIRLPOOL e18e5c426b611f5ba102c2bfa935c26bf5be3b42e48c2b337d3827936361daa28ba1185337b1e25d5732063e0cd539661cb740028f811577cd0250ea24b4e0fe
@@ -43,6 +53,7 @@ DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.
DIST github.com-mattn-go-sqlite3-05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5.tar.gz 2030395 SHA256 6253685c0e7ae8141e4b9f07c6fff664edac80b75b8c09b39965f7603850512b SHA512 0899042c28f4dec19f830155d1da03830ddf6c03c96fc10190184f1ad2ed5eb2d69b5b989c40f489846201ba664ed80554f76a03c9e1e291d7fb9636967aba52 WHIRLPOOL 9c7867e45d0dbbc2b9865f0215b7c2b747cfc2c2e35264ca2bf96adaaa71b59374f301548ccb8cf34ff989fbc688e787dde2ce6de770962ef365b6ff6c5328ef
DIST github.com-mattn-go-sqlite3-6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz 2028435 SHA256 650ece3ec45fe26df3879e3e67fc4e21f65547d441b4085f4910817dae54509e SHA512 743b713ff506517c05ea89fe744eebd5b67751305fc720459840ec6c2d0f2d1fff8437f668a38291b9686ecf940a5177c356c34e022fc020540e0f8c60a21ba8 WHIRLPOOL 840e78119db23b74a231d8f01c6f6a20ce5d5933aafa2dda9c2c1179c5f69f2c7e17fb59a5e5771252cc89b859bcc7ed32f777a5bf139f80e0fb6e026d9e2c6e
DIST github.com-mattn-go-sqlite3-83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz 2027317 SHA256 f108517a1ef06a51044a869f4da473b5e3f5f664afeaf4eeb9956c4bc2ad059c SHA512 687b1c9f7b2f27be4ef0d924f691f17251fb84522647436d3e6d1ba5946208618156663d817d146f954ea07d31619c446a3023f9a811f113a3761cda0daebdec WHIRLPOOL 26747056149e68ed1c9b59cfe5e1a6b0b38cdcd06a2d28ea68fef09085969dc1d706be70438552854c35096d3ce6405b6450da6fa5beae911da0e4b8730df8d0
+DIST github.com-olekukonko-tablewriter-0fd34425a5aee40ff3f260b34e6c3b0d59f58c66.tar.gz 14765 SHA256 8e362aed0c169b6f0f1a1263aa7a04ec2208c70d0800a182706007b81ac02da2 SHA512 8006135ecba382466b8a283f1520ef052a909dacf7e4fc68f48549239675fc6225ee0382ef8008b051ac269eb827978dbd5a7e2391ad9f2cab99118189cf90f8 WHIRLPOOL 03c88724d658c62c5acc9d1b7016b891065789965955c9df02390e9eda94c6195b0e5c803152abe873cfcb3cd8d7f834890e8ed1d8a89922b03534ec9e603e51
DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 SHA256 a3f2a6f367b97d8406402a674eaf96c5ee9baab05de32b2031085b8d92e7eea1 SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929 WHIRLPOOL f43f7093b37580845a7e87fe487684d5ef5e51646413d9188e6e3895403a6e028f873c1fc52ae60cf9d677cc9c3d5373c6cb39cb05e3632172ff3827ae4f7064
DIST github.com-olekukonko-tablewriter-febf2d34b54a69ce7530036c7503b1c9fbfdf0bb.tar.gz 11822 SHA256 080a2090ffb58f682a3b15aeccc866b8ff3acfa2020eaaf138b3d0b27f29d0db SHA512 bfccf8eacd32840ec195c0e69d141fc24ca55d9f0832b38ad87e0c2292c61f5ff0731e83a19045ddebde4db8b9cd77b0b84214c5442f4cd4f8a892e77efce758 WHIRLPOOL ca608bae83163bfb2640d2956021f849cbfe6e827f40120b9151ba663fcf248b3157d3a0eb294747ae0f8b9510c79443d9e3193294b874578b2dd3e68cf9a3c2
DIST github.com-pborman-uuid-1b00554d822231195d1babd97ff4a781231955c9.tar.gz 12808 SHA256 54da54d54a914e569fb2b31132e0c458ece12d7cd70c14a33adf95731e07afe7 SHA512 c332bd39781e7a3bd7125bbf26e62da2aca24bb89975491a4165a17580f3ffb99587e4620a9c9c17afff5d34865ae0b86065e1516ca325d0edc4dd84be269283 WHIRLPOOL fb245c1056abe69f7e3fa5a4ded80111777af2fdc107dee3fc36faa25bea8394eb30fda6000075cbdf124cb01c4165ed08fb154d70c30c8a1812988e2bd86619
@@ -54,3 +65,4 @@ DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar
DIST lxd-2.14.tar.gz 629982 SHA256 0ccf98257482458ff417c8af141a1f726fe7e696b7ab8b089ed1ee741280b2b8 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3 WHIRLPOOL 3483b15f7e09e8212fa5b646e5fc6be305b48e6cfcad5538ff9a4967820928b3f87931ca38fc4787ecab67216d2c876476880551ce56e3ed0c080a7b769e2823
DIST lxd-2.16.tar.gz 707146 SHA256 16d4b09f132f628dbacaa192c02ae27baf91a20a57e26cfea2a24b5af6077680 SHA512 63a870f3613f3e7e917bd06bc748d143586af543901cd4e2159015cb2f20fdf40ba7f04971d6dee2e8a5afd60fc1476cef29783ab5ec5e531c35360fdf83e70f WHIRLPOOL 74b8cdd09801840d87e81317e03d153afab833fff4b58efaf58c7c49703d447fd42d08892b83ef3f18635bdb61ebac0df1651ca99eb3d98710b032283b941b5f
DIST lxd-2.17.tar.gz 703925 SHA256 e50da1ffd5c8c1758266ea193b68563dad57b0141adeb17f1a190c9b2c117d0d SHA512 4d2e2bdfb92c08025bf360b8b655300c0c01f3e249bab98b1d346daa6f995c638cbd0b6c48bcbb26c18c875de1ed223afe4b4004fe4c5589715779d53646be0d WHIRLPOOL d5afd3e3a6eb620aaf2b01b31fe918c36397b692df8c8df0b9140cd2a0fdeedda0aa1b495e8c35d4ebb986dbb354481f76a5e1b1cec76b2a7e7a0ab15cc234fc
+DIST lxd-2.18.tar.gz 725957 SHA256 2ae07f56b451ffe78718aeb56b6016c8708b1ed8f1ac79dd9bb6a8916019fc22 SHA512 51116a41c4c13c85729e36047a9c36a997fb79abd383ecf2490be3160a39b90b05042aa0f4c979849c255b9630b03ed2c7acb92c26aed3c20aacce65ef0c70c5 WHIRLPOOL b34eb8f0fd8dc1690df4cf730258c30410f3959e31e6aaebdcddb499c47cdee9fd77dc3319ed9821e5368fa35360d8d9f6d3777c596124f7563e842efa157fbb
diff --git a/app-emulation/lxd/files/lxd-2.18-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.18-dont-go-get.patch
new file mode 100644
index 00000000000..a6e25e325b9
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.18-dont-go-get.patch
@@ -0,0 +1,16 @@
+--- /src/github.com/lxc/lxd/Makefile.orig 2016-07-11 23:34:40.299664675 +0000
++++ /src/github.com/lxc/lxd/Makefile 2016-07-11 23:37:00.816018727 +0000
+@@ -13,13 +13,11 @@
+
+ .PHONY: default
+ default:
+- go get -t -v -d ./...
+ go install -v $(TAGS) $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- go get -t -v -d ./...
+ go install -v $(TAGS) $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd-2.18.confd b/app-emulation/lxd/files/lxd-2.18.confd
new file mode 100644
index 00000000000..3d553276a5e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.18.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.18.initd b/app-emulation/lxd/files/lxd-2.18.initd
new file mode 100644
index 00000000000..b1fa7caac54
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.18.initd
@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+ need net
+ use lxcfs
+}
+
+start() {
+ ebegin "Starting lxd service"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers"
+ if "${DAEMON}" shutdown; then
+ /etc/init.d/lxd zap
+ rm -f ${PIDFILE}
+ fi
+ eend $?
+}
diff --git a/app-emulation/lxd/files/lxd-2.18.service b/app-emulation/lxd/files/lxd-2.18.service
new file mode 100644
index 00000000000..d00635fbcdd
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-2.18.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Container hypervisor based on LXC
+
+[Service]
+ExecStart=/usr/sbin/lxd --group lxd
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-emulation/lxd/lxd-2.18.ebuild b/app-emulation/lxd/lxd-2.18.ebuild
new file mode 100644
index 00000000000..c18c43f6dae
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.18.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2017 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/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
+EGO_VENDOR=(
+ "github.com/dustinkirkland/golang-petname d3c2ba80e75eeef10c5cf2fc76d2c809637376b3"
+ "github.com/golang/protobuf 130e6b02ab059e7b717a096f397c5b60111cae74"
+ "github.com/gorilla/mux 3f19343c7d9ce75569b952758bd236af94956061"
+ "github.com/gorilla/websocket 6f34763140ed8887aed6a044912009832b4733d7"
+ "github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
+ "github.com/jessevdk/go-flags 6cf8f02b4ae8ba723ddc64dcfd403e530c06d927"
+ "github.com/mattn/go-colorable ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b"
+ "github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
+ "github.com/mattn/go-sqlite3 05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5"
+ "github.com/olekukonko/tablewriter 0fd34425a5aee40ff3f260b34e6c3b0d59f58c66"
+ "github.com/pborman/uuid e790cca94e6cc75c7064b1332e63811d4aae1a53"
+ "github.com/stretchr/testify 890a5c3458b43e6104ff5da8dfa139d013d77544"
+ "github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
+ "github.com/go-stack/stack 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
+ "github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe"
+ "github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
+ "golang.org/x/crypto 7d9177d70076375b9a59c8fde23d52d9c4a7ecd5 github.com/golang/crypto"
+ "golang.org/x/net 0744d001aa8470aaa53df28d32e5ceeb8af9bd70 github.com/golang/net"
+ "golang.org/x/sync f52d1811a62927559de87708c8913c1650ce4f26 github.com/golang/sync"
+ "golang.org/x/text 1cbadb444a806fd9430d14ad08967ed91da4fa0a github.com/golang/text"
+ "golang.org/x/tools e531a2a1c15f94033f6fa87666caeb19a688175f github.com/golang/tools"
+ "golang.org/x/sys 429f518978ab01db8bb6f44b66785088e7fba58b github.com/golang/sys"
+ "gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
+ "gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2"
+ "gopkg.in/inconshreveable/log15.v2 b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f github.com/inconshreveable/log15"
+ "gopkg.in/lxc/go-lxc.v2 89b06ca6fad6daea5a72a1f47e69e39716c46198 github.com/lxc/go-lxc"
+ "gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
+ "gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml"
+)
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 nls test"
+
+inherit bash-completion-r1 linux-info systemd user golang-vcs-snapshot
+
+SRC_URI="${ARCHIVE_URI}
+ ${EGO_VENDOR_URI}"
+
+DEPEND="
+ >=dev-lang/go-1.7.1
+ dev-libs/protobuf
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-arch/xz-utils
+ >=app-emulation/lxc-2.0.7[seccomp]
+ net-dns/dnsmasq[dhcp,ipv6?]
+ net-misc/rsync[xattr]
+ sys-apps/iproute2[ipv6?]
+ 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"
+
+PATCHES=(
+ "${FILESDIR}/${P}-dont-go-get.patch"
+)
+
+src_prepare() {
+ default_src_prepare
+
+ # Examples in go-lxc make our build fail.
+ rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ emake
+ else
+ # build client tool
+ emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ export GOPATH="${S}"
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ emake check
+ fi
+}
+
+src_install() {
+ dobin bin/lxc
+ if use daemon; then
+ dosbin bin/lxd
+ dobin bin/fuidshift
+ fi
+
+ cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
+
+ if use nls; then
+ domo po/*.mo
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_newunit "${FILESDIR}"/${P}.service ${PN}.service
+ fi
+
+ newbashcomp config/bash/lxd-client lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+ einfo
+ einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+ einfo "a patched kernel and iproute2."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2018-04-08 20:05 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2018-04-08 20:05 UTC (permalink / raw
To: gentoo-commits
commit: aef61f3e7622e190f8833f0738661647c279a4f9
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 8 20:04:56 2018 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 20:04:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef61f3e
app-emulation/lxd: Support latest confd options
Closes: https://bugs.gentoo.org/652206
Package-Manager: Portage-2.3.26, Repoman-2.3.7
app-emulation/lxd/files/lxd.confd.1 | 24 ++++
app-emulation/lxd/lxd-3.0.0-r1.ebuild | 251 ++++++++++++++++++++++++++++++++++
app-emulation/lxd/metadata.xml | 4 +-
3 files changed, 277 insertions(+), 2 deletions(-)
diff --git a/app-emulation/lxd/files/lxd.confd.1 b/app-emulation/lxd/files/lxd.confd.1
new file mode 100644
index 00000000000..8e342cc62d1
--- /dev/null
+++ b/app-emulation/lxd/files/lxd.confd.1
@@ -0,0 +1,24 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" --verbose"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
diff --git a/app-emulation/lxd/lxd-3.0.0-r1.ebuild b/app-emulation/lxd/lxd-3.0.0-r1.ebuild
new file mode 100644
index 00000000000..6330fcb2112
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.0.0-r1.ebuild
@@ -0,0 +1,251 @@
+# 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/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
+# The "# branch" comments are there for the script, they're important.
+EGO_VENDOR=(
+ "github.com/lxc/lxd e641ae45dc13cc27510c9d2127eece46ed9ac16b"
+ "github.com/CanonicalLtd/go-sqlite3 730012cee3364e7717c28f7e9b05ee6dd8684bae"
+ "github.com/CanonicalLtd/dqlite 9334841532709c77fc79e13a08408694e4bb3616"
+ "github.com/CanonicalLtd/go-grpc-sql 534b56d0c689ed437e6cff44868964d45d3ec85c"
+ "github.com/CanonicalLtd/raft-http e4290d0af830073ec140538e8974aa4393495ea1"
+ "github.com/CanonicalLtd/raft-membership 26ef52960f54c472f52fb3701f19f25319e1032e"
+ "github.com/CanonicalLtd/raft-test 22441a088d5630ddd2e971eae68074d2b645f1b7"
+ "github.com/dustinkirkland/golang-petname d3c2ba80e75eeef10c5cf2fc76d2c809637376b3"
+ "github.com/flosch/pongo2 97eac295f74b5fbb7fd3113e35f4ccf3c816e389"
+ "github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
+ "github.com/juju/idmclient 15392b0e99abe5983297959c737b8d000e43b34c"
+ "github.com/juju/httprequest 77d36ac4b71a6095506c0617d5881846478558cb"
+ "github.com/juju/utils d18e608d01400189bcda3e2669505cbd30e9dda9"
+ "github.com/juju/loggo 7f1609ff1f3fcf3519ed62ccaaa9e609ea287838"
+ "github.com/juju/webbrowser 54b8c57083b4afb7dc75da7f13e2967b2606a507"
+ "github.com/juju/gomaasapi 663f786f595ba1707f56f62f7f4f2284c47c0f1d"
+ "github.com/juju/schema e4f08199aa80d3194008c0bd2e14ef5edc0e6be6"
+ "github.com/juju/version b64dbd566305c836274f0268fa59183a52906b36"
+ "github.com/juju/persistent-cookiejar d5e5a8405ef9633c84af42fbcc734ec8dd73c198"
+ "github.com/juju/go4 40d72ab9641a2a8c36a9c46a51e28367115c8e59"
+ "github.com/juju/testing 43f926548f91d55be6bae26ecb7d2386c64e887c"
+ "github.com/juju/retry 1998d01ba1c3eeb4a4728c4a50660025b2fe7c8f"
+ "github.com/golang/protobuf e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"
+ "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+ "github.com/gorilla/mux 4dbd923b0c9e99ff63ad54b0e9705ff92d3cdb06"
+ "github.com/gorilla/websocket eb925808374e5ca90c83401a40d711dc08c0c0f6"
+ "github.com/julienschmidt/httprouter d1898390779332322e6b5ca5011da4bf249bb056"
+ "github.com/rogpeppe/fastuuid 6724a57986aff9bff1a1770e9347036def7c89f6"
+ "github.com/pkg/errors 816c9085562cd7ee03e7f8188a1cfd942858cded"
+ "github.com/ryanfaerman/fsm 3dc1bc0980272fd56d81167a48a641dab8356e29"
+ "github.com/hashicorp/raft a3fb4581fb07b16ecf1c3361580d4bdb17de9d98"
+ "github.com/hashicorp/go-immutable-radix 7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
+ "github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
+ "github.com/hashicorp/go-msgpack fa3f63826f7c23912c15263591e65d54d080b458"
+ "github.com/hashicorp/raft-boltdb 6e5ba93211eaf8d9a2ad7e41ffad8c6f160f9fe3"
+ "github.com/armon/go-metrics 783273d703149aaeb9897cf58613d5af48861c25"
+ "github.com/stretchr/testify c679ae2cc0cb27ec3293fea7e254e47386f05d69"
+ "github.com/boltdb/bolt fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5"
+ "github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade"
+ "github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
+ "github.com/mattn/go-runewidth a9d6d1e4dc51df2130326793d49971f238839169"
+ "github.com/syndtr/gocapability 33e07d32887e1e06b7c025f27ce52f62c7990bc0"
+ "github.com/pborman/uuid c65b2f87fee37d1c7854c9164a450713c28d50cd"
+ "github.com/spf13/cobra 4dab30cb33e6633c33c787106bafbfbfdde7842d"
+ "github.com/spf13/pflag 1cd4a0c365d95803411bec89fb7b76bade17053b"
+ "github.com/cpuguy83/go-md2man 48d8747a2ca13185e7cc8efe6e9fc196a83f71a5"
+ "github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
+ "github.com/frankban/quicktest 536e76da5efc46dc247088384c2d2cea7da968aa"
+ "github.com/google/go-cmp 5411ab924f9ffa6566244a9e504bc347edacffd3"
+ "github.com/kr/pretty cfb55aafdaf3ec08f0db22699ab822c50091b1c4"
+ "github.com/kr/text 7cafcd837844e784b526369c9bce262804aebc60"
+ "github.com/olekukonko/tablewriter b8a9be070da40449e501c3c4730a889e42d87a9e"
+ "google.golang.org/genproto ab0870e398d5dd054b868c0db1481ab029b9a9f2 github.com/google/go-genproto"
+ "google.golang.org/grpc 2dfcc11f7a6d4791ba627222d783eedf268b4b95 github.com/grpc/grpc-go"
+ "golang.org/x/crypto 12892e8c234f4fe6f6803f052061de9057903bb2 github.com/golang/crypto"
+ "golang.org/x/net b68f30494add4df6bd8ef5e82803f308e7f7c59c github.com/golang/net"
+ "golang.org/x/sys 378d26f46672a356c46195c28f61bdb4c0a781dd github.com/golang/sys"
+ "golang.org/x/text ece95c760240037f89ebcbdd7155ac8cb52e38fa github.com/golang/text"
+ "gopkg.in/errgo.v1 442357a80af5c6bf9b6d51ae791a39c3421004f3 github.com/go-errgo/errgo" # branch v1
+ "gopkg.in/juju/names.v2 54f00845ae470a362430a966fe17f35f8784ac92 github.com/juju/names" # branch v2
+ "gopkg.in/juju/environschema.v1 7359fc7857abe2b11b5b3e23811a9c64cb6b01e0 github.com/juju/environschema" # branch v1
+ "gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml" # branch v2.2.1
+ "gopkg.in/macaroon-bakery.v2 94012773d2874a067572bd16d7d11ae02968b47b github.com/go-macaroon-bakery/macaroon-bakery" # branch v2.0.1
+ "gopkg.in/macaroon.v2 bed2a428da6e56d950bed5b41fcbae3141e5b0d0 github.com/go-macaroon/macaroon" # branch v2.0.0
+ "gopkg.in/httprequest.v1 1a21782420ea13c3c6fb1d03578f446b3248edb1 github.com/go-httprequest/httprequest" # branch v1.1.1
+ "gopkg.in/lxc/go-lxc.v2 2660c429a942a4a21455765c7046dde612c1baa7 github.com/lxc/go-lxc" # branch v2
+ "gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb" # branch v2
+ "gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655 github.com/go-mgo/mgo" # branch v2
+ "gopkg.in/retry.v1 2d7c7c65cc71d024968d9ff4385d5e7ad3a83fcc github.com/go-retry/retry" # branch v1.0.0
+ "gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check" # branch v1
+)
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test"
+
+inherit bash-completion-r1 linux-info systemd user golang-vcs-snapshot
+
+SRC_URI="${ARCHIVE_URI}
+ ${EGO_VENDOR_URI}"
+
+DEPEND="
+ >=dev-lang/go-1.7.1
+ dev-libs/protobuf
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-arch/xz-utils
+ >=app-emulation/lxc-2.0.7[seccomp]
+ dnsmasq? (
+ net-dns/dnsmasq[dhcp,ipv6?]
+ )
+ net-misc/rsync[xattr]
+ sys-apps/iproute2[ipv6?]
+ 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"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-dont-go-get.patch"
+)
+
+src_prepare() {
+ default_src_prepare
+
+ # Examples in go-lxc make our build fail.
+ rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ emake
+ else
+ # build client tool
+ emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ export GOPATH="${S}"
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ emake check
+ else
+ einfo "No tests to run for client-only builds"
+ fi
+}
+
+src_install() {
+ dobin bin/lxc
+ if use daemon; then
+ dosbin bin/lxd
+ dobin bin/fuidshift
+ fi
+
+ cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
+
+ if use nls; then
+ domo po/*.mo
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${PN}.initd lxd
+ newconfd "${FILESDIR}"/${PN}.confd.1 lxd
+
+ systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+ fi
+
+ newbashcomp scripts/bash/lxd-client lxc
+
+ dodoc AUTHORS README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+ einfo
+ einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+ einfo "a patched kernel and iproute2."
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index d4ab64b98a1..a0dd29a5f4e 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -10,8 +10,8 @@
<name>Virgil Dupras</name>
</maintainer>
<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
</maintainer>
<longdescription>
By combining the speed and density of containers with
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2018-05-21 1:29 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2018-05-21 1:29 UTC (permalink / raw
To: gentoo-commits
commit: d6be94961308bcbc954135412868267b9216f78e
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 01:26:29 2018 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon May 21 01:26:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6be9496
app-emulation/lxd: bump to 3.1
Closes: https://bugs.gentoo.org/652846
Closes: https://bugs.gentoo.org/639020
Package-Manager: Portage-2.3.38, Repoman-2.3.9
app-emulation/lxd/Manifest | 1 +
.../lxd/files/ja-translation-newline.patch | 11 ++
app-emulation/lxd/lxd-3.1.ebuild | 180 +++++++++++++++++++++
3 files changed, 192 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 09518bce21b..653ac15bf85 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -96,3 +96,4 @@ DIST github.com-syndtr-gocapability-33e07d32887e1e06b7c025f27ce52f62c7990bc0.tar
DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 BLAKE2B 584e75a9c47d28498aedb5c85b3409c79c84ec9fc47a5a9dc77aa117b4e48f681f72a12a03fafa566a405def40b4961bb7343cad0c6ecb3cd9da883a51ed20d6 SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae
DIST lxd-2.21.tar.gz 882352 BLAKE2B 80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b SHA512 9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e
DIST lxd-3.0.0.tar.gz 1152282 BLAKE2B e84808c626064ba6985c08119905510c2a9659edca09887a55bfe006eaba4a624215d48978e18ab642f34e54e58fc1d2e04303c9db73c332df8c5d29568fb779 SHA512 b4de839d26080f2b14b1f6f04a92b000e1abaa0712377528b87ca79e01b9c46b7b6c7f7ce5365f37f7a0ae8a2459bcdc6010fcb2a238d78e34d090750ae070f3
+DIST lxd-3.1.tar.gz 27979442 BLAKE2B 0b74e3f76a7ab835b042b52b469a6fe11e7077d567e0658d13fab2192fd25d99518d65ba319c981a2e4677319e280cccae26f70ef99e9911264dc028ca5628fd SHA512 61f64d08dd80f7f676f386912f4dfc0d0af38cce0287de7865123b9da667b54ab91d22b76ffe03480e04ae0fbd8dc837d7d519d0e34409377c3d7e6624bf636c
diff --git a/app-emulation/lxd/files/ja-translation-newline.patch b/app-emulation/lxd/files/ja-translation-newline.patch
new file mode 100644
index 00000000000..bbda24c6f37
--- /dev/null
+++ b/app-emulation/lxd/files/ja-translation-newline.patch
@@ -0,0 +1,11 @@
+--- /po/ja.po 2018-05-20 19:42:38.932990198 -0500
++++ /po/ja.po 2018-05-20 19:42:55.839944861 -0500
+@@ -1380,7 +1380,7 @@
+ "イメージのエイリアスを一覧表示します\n"
+ "\n"
+ "指定するフィルタはイメージのハッシュ値の一部でもイメージのエイリアスの一部で"
+-"も構いません。"
++"も構いません。\n"
+
+ #: lxc/image.go:888
+ msgid "List images"
diff --git a/app-emulation/lxd/lxd-3.1.ebuild b/app-emulation/lxd/lxd-3.1.ebuild
new file mode 100644
index 00000000000..7f27f52217f
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.1.ebuild
@@ -0,0 +1,180 @@
+# 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"
+
+inherit bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+DEPEND="
+ >=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]
+ dnsmasq? (
+ net-dns/dnsmasq[dhcp,ipv6?]
+ )
+ net-misc/rsync[xattr]
+ sys-apps/iproute2[ipv6?]
+ 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"
+
+PATCHES=(
+ "${FILESDIR}/ja-translation-newline.patch" # https://github.com/lxc/lxd/pull/4572
+)
+
+# LXD tarball is packaged with a nice "dist" folder containing all dependencies
+# that were vendored by upstream at release time. That saves us the trouble of
+# vendoring the dependencies ourselves. This is why there was this drastic drop
+# in ebuild complexity compared to pre 3.0.0-r2 ebuilds.
+src_compile() {
+ export GOPATH="${S}/dist"
+
+ # 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.
+ #
+ # ABOUT "-tags libsqlite3": we used to link to the system's sqlite3 library
+ # but since v3.0.0, LXD depends on github.com/CanonicalLtd/dqlite which
+ # at the time of this writing, depends on patched version of sqlite with
+ # replication capabilities added. We don't have that patch in dev-db/sqlite.
+ # Therefore, we let LXD use its own private copy of sqlite.
+ go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
+
+ if use daemon; then
+ go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
+ go install -v -x ${EGO_PN}/lxd || die "Failed to build the daemon"
+ 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
+ dosbin ${bindir}/lxd
+ dobin ${bindir}/fuidshift
+ fi
+
+ if use nls; then
+ domo po/*.mo
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${PN}.initd lxd
+ newconfd "${FILESDIR}"/${PN}.confd.1 lxd
+
+ systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+ fi
+
+ newbashcomp scripts/bash/lxd-client lxc
+
+ dodoc AUTHORS README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+ einfo
+ einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+ einfo "a patched kernel and iproute2."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2018-07-03 12:23 Virgil Dupras
0 siblings, 0 replies; 31+ messages in thread
From: Virgil Dupras @ 2018-07-03 12:23 UTC (permalink / raw
To: gentoo-commits
commit: d3eb22b92b1a63934cabf8b17066e58413c1c4b9
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 3 12:19:58 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Jul 3 12:23:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3eb22b9
app-emulation/lxd: revert removal of v2.21
It was a mistake to remove it because it was the only stable version
left
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-emulation/lxd/Manifest | 44 +++++
app-emulation/lxd/files/lxd-dont-go-get.patch | 16 ++
app-emulation/lxd/files/lxd.confd | 27 ++++
app-emulation/lxd/lxd-2.21.ebuild | 224 ++++++++++++++++++++++++++
4 files changed, 311 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 1389d1729bb..e4d4728dc2a 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,46 @@
+DIST github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz 15127 BLAKE2B 06338b4364d9554a1334c04bd9ea81df7539641ef5ce41d681670b7b65c06160ef67e4bd3ad2529dc7864537d5be6a91be53c5e96335f5dfcab198a8bcae9a9b SHA512 0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d
+DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 59915 BLAKE2B 763403cec3bcb27acd6654e7d2d57d198862b0d16c242ec975b46a7cca95560505b3373e8c4b7a53e7fc025523845bee16b90311f8bd341c0d2bfc28987ae0d4 SHA512 c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee
+DIST github.com-go-errgo-errgo-442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz 7453 BLAKE2B 9f231836718860c023a487d0971e152656e0ff39dcd5efdfda8c62577dbf4ae82335bada308d44a4d0af5ec951e5608f40bb9e0a7567c1edce35664c98596744 SHA512 f54cdf5089b7e46f08f75f7f1b0bfb893b1cd0a36d08b925d5ba04d2fa6021e85fe0625235a9e712b09099e2f5cce46aa1700d12c12b0c54ab59c8d13030e820
+DIST github.com-go-httprequest-httprequest-fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz 52964 BLAKE2B f0dddcd38b9f8ac75a3e45473e22cfab1db88bef19f90431b16d1a3699ab56ef7f0d038ce837c0305600d69bc5ba64dffd344143cd0bc4a10aa5093ca32b0771 SHA512 60688f2e320afaeaeb824226bd586b9e9d7ccde00d9585401ac328d83195a23dc3e4e26b1848bc9998023b732a559963920860f21056416161c31304388aad4d
+DIST github.com-go-macaroon-bakery-macaroon-bakery-ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz 124110 BLAKE2B c05d59504f7cd2d0cdb913b1d06898375fce112e71a1db0c1752628bc9939003a92ad608463cd0e1fa8d75945b9b5a76c0710ebb3ea126cfd67ea01b46229bff SHA512 2965b6441df2790e0378b962fb66672e2316902620223e4ca3a8ddf1ef38e2a76b9cda2a5013e664ef49073aed8f424e1713538626f6ce1929e81e3bacbef45f
+DIST github.com-go-macaroon-macaroon-bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz 22383 BLAKE2B b2d89ccdf4ad0a8c29f44895697a9921d40b9316879f477f608fc5f59683f825a66357e5587d654a55ea80f0c79d6680f5dbb45590b2fea051fca4a7f23a9eb8 SHA512 7ec072cec42266cf8cdd44819c653b8d09b58622fdfa42fb12422c9727e6eb7326519fbeb247fa4840d8c87a5357ae0acd028a8d5757acedc3582810a5cc467b
+DIST github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz 376880 BLAKE2B 800038e0870d8b943604bc5edf9ba566d20fed75f445834801955a19da6add891f96cbf5e19a93d520d90ccc4e9da911ab02cccb710fee67b3fe60e4409a717f SHA512 f0e7948d4672d29d3d0a741961ff8a75d30c556e157698118a32de10e2af8eb2ae6a61feea1c93aff313596d285a048a70dae7339c66760ebb91a1aecfb05845
+DIST github.com-go-retry-retry-01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz 9318 BLAKE2B d5eb408e4c4acf0c2304d951705a1f39f2b2663357f04402f5ee47bfc79182511e3a29568846bb902887aa5efb149ac6a4cf32ecae07a183f845ad8886fe0377 SHA512 71956a468472754313830a7f1afc844020e5ffc8bac4464e369562bde8c1cf5e11814fc110dcb00d243cbc6c13fe7a0423d29b73f0f420df8313666e645a7a24
+DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 BLAKE2B 9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1 SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
+DIST github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz 64826 BLAKE2B 47e9182124037317bdfc31137a2715db979146688e637a586f5a7c4a12250d0fcffdbbaa8793e189421d189b1071f48d8588cfda9ac1f3e297bfc244f30bcae7 SHA512 429256bb847defb53dee5c960edc726455397045e7dc2e4833e0e9088f9ec11452e2198961080dc00b8eff9d165df5e0377f4039932df0e46cd960827b8f800d
+DIST github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz 1443268 BLAKE2B 19bb8d2861225a14ba3f19b2ae96c6640833fea7da52228480634e715b7690afc94e605a5be1b70b263bb3045a0fbcf9f78211c431836d077cca7d076fec1686 SHA512 e82f87394d2a8d96779cc69c8803555b5d23eb02f3d38101ccb9142a892280c32b8123d61a309a041cf5034282b5269ea38b5d29e03c85ca3c62c4fc0802502e
+DIST github.com-golang-net-d866cfc389cec985d6fda2859936a575a55a3ab6.tar.gz 930024 BLAKE2B 9ab7175433046805426177276d963bdc356d488672e97cbd696e7d73f376af50a71ed5e8ba8c57e57ad0c6aa091bc8a54b1e67f09cf0085211363f4c33f077c5 SHA512 c841b5ab218f1ea6c8743264c72506ffa90372a7c8dc0fa1b1c22c965bf56e715ecf688acd22b5ecf747b7ded51f2f48fcdc859e4ce9d30911f48e3a6055d599
+DIST github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz 268477 BLAKE2B af1775f715a7c8434fe46872d8edf75241c851fb93e1e3f888c5fa1b603397e68c3878c9c69afe618ff1b7ae3d0c219ec96b8648af2fd2c2c9424a33f1710a2e SHA512 07de72078a66528d864da78c88be36351cf79be5235ec9f4ed1d71061a56b9b216fd29984ccfb2a610223a86b80aba2b9ca28a0d36fc2346b23070e25e72e29b
+DIST github.com-golang-sys-571f7bbbe08da2a8955aed9d4db316e78630e9a3.tar.gz 789287 BLAKE2B 65b5dea36632e0521d0bb8fb73ae69b89eb533628081f966da956d5f572d9611e817202675aaeefc69492428401067094e1c07cd038cba91bea7e50649b95fce SHA512 7fa096e1a1282155b614c02d3d190fdd94096d2e51447b4dca59dba255edc9316835036e0cc91aa7439047c17e63faf279018e0f6c9e8d2b0b9a12c7e553a93c
+DIST github.com-gorilla-mux-5ab525f4fb1678e197ae59401e9050fa0b6cb5fd.tar.gz 33298 BLAKE2B 06f86b8f5a2794ac62a8088495ea7f62fc2e1afbed94d9c700be7ca00ab13fcce092b83e456a022893c46e7447e36f210189ed136271e34028829cac01058713 SHA512 a0e920b3aef17e2c81861343f41f26fe1f579a6589abac89fe00cdd2167f5f1a6fc0e2a1b2dbd69d0b3ea7e08f3c50297f0b7c952043259a220ec95b2ceb30f5
+DIST github.com-gorilla-websocket-cdedf21e585dae942951e34d6defc3215b4280fa.tar.gz 47287 BLAKE2B bc5baecc1779e821841c2b784aa7f43ee9e7a41ca2079c79538447a7645fbf5e87ae981b744ec973345da351114ea133f219d9ac1af5accfe470e8cdf1fca169 SHA512 88b7c5dacff563d88d3d4e06f57e2552ce10108beb239844323f58ff7829c9b717a8023e45805c5a9f649bfbf513d0384e0fab722968936deddc236048306686
+DIST github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz 9682 BLAKE2B 2f8f662b5cfcfc00361a1aa1e658bb077da7dc42b220288691c92a9ca6555425a13f15b8fd8575e88ba8081e873687fc87b3a39c33efc80757323f7e70de17b5 SHA512 99a00ecfeb4226bba01dbef615f02b22f54959252c9fb99ed55f8c040026305fa54256f78eceb5c02ac6a77842c72fda43d1790590adfdcf3202095ad836a198
+DIST github.com-juju-environschema-7359fc7857abe2b11b5b3e23811a9c64cb6b01e0.tar.gz 17589 BLAKE2B 9c5bda709623cf05123ec0435af3be8017f2d1b2a296e1be3a1a98eac410bc38ab3c3d98848725707cc407b1c42a48f784bf69433854191a83bbaddac356f0c8 SHA512 ffc9d445c01c3b4d810320b3ff230226f6de1beda50660b3ead7eb2b5a0098661aaa4c929bd36b1acdc442d4504dea6c1b12ad94b5a8d0c1e7f79bdfb2abe4d9
+DIST github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz 16210 BLAKE2B 7202acb00a3126943989fd276b9991122895dcb99a5b6e6a966f58e634b037447bbf49316c6c59e98aa9183b77aa07d9b4c4c7ad758ade2704cc3cdcac84a9c7 SHA512 04dfe2f155724d98c31fa2d274a13e77efc34364ffae172fffbc8e14b72f68a6301e6f582c1ff9f37cb105d11a7b3197e2ffa635f410ffb64d54e7c6fd1b9d1a
+DIST github.com-juju-go4-40d72ab9641a2a8c36a9c46a51e28367115c8e59.tar.gz 49363 BLAKE2B c037d267cef945e9760cfb8fcfb366553e850423bf98610db03b51154455dd5c6d2d3de91bf37956249f4ffc1ed5fb850b0438fcdea2891929ab4e7de73be989 SHA512 aca20234f5693a48f5cca41eb59e8e2b1320feec05a7961a950e596d9bcc14ed86786d815e0372cced669548cfa9386e9bcf0eb774a42954fd7a2fd095e9890b
+DIST github.com-juju-gomaasapi-663f786f595ba1707f56f62f7f4f2284c47c0f1d.tar.gz 101563 BLAKE2B 5ea442af00c6a30ad54e2f75eb2da41c29fb24364b00ab8bd8995f1b4ca2205b32e1d90fcfe03c7517884b4ef830c471e03a118b89f65c21388332027fd8e0a6 SHA512 edca0adf9f48f1c656236203c8686b67f5926f736725a7d910a47804f5005aa642bf1cc8e5a9079c5c50a3cfe6d0c735a645e52a1aa1da5380735f76be9b1436
+DIST github.com-juju-httprequest-77d36ac4b71a6095506c0617d5881846478558cb.tar.gz 49764 BLAKE2B 98a666f5477f9cd46baa13b19918cd07c5b9f8f94390d87a67230331ffd292de99a430ecb5588de045cc2573c7dbfae0c40fe043778d6917f4dcfbcf25cc8961 SHA512 9ab66aebaa650c7d67accf9261f4eaf2ba28ff37846350719b0d83774502b29fd4b179913669f0b833b99142905b4892b71ea76d368c707567e8b4b01378d27f
+DIST github.com-juju-idmclient-15392b0e99abe5983297959c737b8d000e43b34c.tar.gz 28723 BLAKE2B a15138e673a26600fbcd8c36a34bcd3e7e904b3afa306fde7d59eb72fc454be797d27f0c05221d290aebc09c5db5f80b458d9a85cfb68358ad17d834b694abc5 SHA512 65d5e8af7873f856250843fd43b14ba8c8ebc114a8fe9734d4073db5dc046079c7fbed9cc3c78aad4c74f886aeb9009c00a009bc6e683f6b5f8162e25a7af7d3
+DIST github.com-juju-loggo-8232ab8918d91c72af1a9fb94d3edbe31d88b790.tar.gz 22060 BLAKE2B 9e6c4cc2ab50ea43f5471510d67f0f134bc2046c3524d571bf4c884a4c09f5df160f4013cf8e05939cddf039c687b3dce512408f7305f320f4b1d17cf209609a SHA512 74ccd8f6f8600a38154d6a12436566111f4073fbbcfa5f0eb57a1813ddd97398d6e906f0b9be09a4304f677870ee70127f4906e9902dd6d767e3ef467e224883
+DIST github.com-juju-names-54f00845ae470a362430a966fe17f35f8784ac92.tar.gz 26092 BLAKE2B ad9f347ad1e2315f40e39ff0601e425dd4567ae53a71884e851a954d08e67df586469e489645951b6c6058a9c4be053089c3c74d3f63208a70862f269261a7de SHA512 de1a6d8cdf82cf19f11354e98a69d1580f4717c92479445f750ac06ef918804e1d35d994e480bdca64b1ecdca91533ec4961dc057bee0d886759f1ade0e87d07
+DIST github.com-juju-persistent-cookiejar-d5e5a8405ef9633c84af42fbcc734ec8dd73c198.tar.gz 23237 BLAKE2B 16eca916ba084dacf905d61f66f9d6ca4f5041a49b3d8849bf2c3f5182db89f29ea9de5fcbde45d8fffd54699c150710447216db0d356cd51eaf784290429ebd SHA512 4e534e305b9433974fc3b5fac6aadad9430ca5b8905c733913360b2a7ee37aa504a546fc1413d43af4938143132618db9890cbd1d22b3a5b91475680a4af84ca
+DIST github.com-juju-schema-e4e05803c9a103fdfa880476044100ac17e54830.tar.gz 11859 BLAKE2B 86ac989a6426f3faf791494b319668c2cc86a82ae645301ca6855b50f9a26ff3ccbc241d6d1be261c5d2548952479c9b8ce1ff2db2a335e7b8f71539d42a7a0c SHA512 b9097f06b220c7db1b2fc4305ee28540dc66ff4b8eff7e16186c241430264fb4dd6e190c90fef91543072bfcb6681a5ec8215e890c522297dbbf25aabfacb154
+DIST github.com-juju-utils-4d9b38694f1e441c16421e2320f2b2fbd97fa597.tar.gz 207854 BLAKE2B 284c0990484e76ecca5feba7e40700bb0315e855618554068f9bd5606372242ac49123c5f5f7b4c59e6c16331b07157aba3eec1e7d2589e70a1fe11f24c5cb45 SHA512 5ba34b5804f661c56b8ea94dcf17099f77c061559e859cc0dba057f7aede0998ae55cdf77abb0693b6d44eb7de8dcf1449a7cc4f644d03f3649e5e8575d297eb
+DIST github.com-juju-version-1f41e27e54f21acccf9b2dddae063a782a8a7ceb.tar.gz 6965 BLAKE2B d90780eed7a910c07d33e4debc5e877599935d6e377bc19560aeb46c83f93fe90fa323b9712a23b6ae4e4e78fba5c4b1aa9b2be308527b265493d8e25f363605 SHA512 80406755558ad1d1101ae93db00405d8305ad5bddbf3124f86e955ab351d3e7882588b7d13dc605f04413fc961f4fde5fe228058d178bcd666b377c9066f17ff
+DIST github.com-juju-webbrowser-54b8c57083b4afb7dc75da7f13e2967b2606a507.tar.gz 3930 BLAKE2B 58b8a759379dd8bd25805c41813d8ac6dff16253ec8ca063a7d93eeeaf7741451d08cebcd323299a8f828de7e87b2db3df63f3f31188eabd6862ab9cad4cde65 SHA512 ac04ae3adaa95fbd3278019629dd6ed12070a93697217098b1755998cbc6143c606e8176c172883fd27d55cea35b9877877b88a7fa5dd6dd4106477744c0b013
+DIST github.com-julienschmidt-httprouter-e1b9828bc9e5904baec057a154c09ca40fe7fae0.tar.gz 22461 BLAKE2B 159deb9cb8fe32f165bf96b9240f68c0fbf35873b6fe9f05c351f690e8a3713eed8a048fe2d917dc0f3622d0c4b84509771f20c9d4eeff8d380bd8b841d19748 SHA512 a8e1610caa188bcde29a603c05e2cc6914949637d17d4f8d7d0efa51edc4c348767af7fdf3072365ed2f26e0947112a5521a88fec383697243a85061b741462c
+DIST github.com-lxc-go-lxc-a7d112aed2f5f57f565d6e557671eeef7e76811c.tar.gz 38226 BLAKE2B 62ad90e0a0ae511b8b94857ad8be761f3d8fb0678ee67321934a2be6a931b6623822c51a4f304e59127008d75f5d44a7dd897d35591e6414b906a16c45232466 SHA512 7c2fffc303e4c8f89676e9a704f64698f2c7e35bcdb7376a9917d89e611dba06a8a42267edd58ad8ca099f43cbde41c0c6a99b6950c0bbcdb9f49296ded4da50
+DIST github.com-lxc-lxd-a324ad91230e5353fe746d06636dc59211122e6c.tar.gz 883109 BLAKE2B 9f4b7cf665fe693addbc56b721e0a02e8f64002e7e8bfa2d9a084590f7076c6e991db22a60d4b4070cece7f223fefa5f8ca35a68121edee8fbc9bb1437fb9c7f SHA512 ae1f43fef4a33e48f9c2a002a5e32dd7177eda78449180e147b2b23c8442bc5ad3def120caf2a4e494b4e4b6f1415c51af999fa7c838e3710ce046e3f653b03b
+DIST github.com-mattn-go-colorable-6fcc0c1fd9b620311d821b106a400b35dc95c497.tar.gz 8152 BLAKE2B 1bf8a085568b775c6aba6ef292be680e0ac522434b8563936f3061e8d44096b7a17e813b6b9818ecc3e5b3478259c1f364a48182cf46906336fea852e345d45f SHA512 da35fd75832c039baeb089dab06565ea7bda0eaddc14188a1ad21306b268322fd53f01cd48c652a0bae947139d8c8eb0086740edfa1ce7463625a9c9b2d9180b
+DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421
+DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 BLAKE2B e9f1d0da4d69c110a9b9ef0ec640dcb53bcc101288b15411367760b5710808f64eb8fe6f0d61f77ba89cad2f965da2d4f72d92e42a07986e1cc39777a050a8f8 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70
+DIST github.com-mattn-go-sqlite3-d5ffb5c0cca8778699a929b236766f4a7af674e8.tar.gz 2071644 BLAKE2B e2aecc6c65f68120682afec947740c4c04dc464d09b19f92bcbe1660cc854be721d8b73734eb5aea701426336c88194768dd28b83ce96b4cdb1d1343105d5bda SHA512 daba1d9cfbed25f92fcedeae7588f31bfe8ad1eea30ae7e24fa4a83dee015f06858b05d6ead61d5a22cbf477070a275767132c030eb4697640cd8acd99816fe9
+DIST github.com-mpvl-subtest-f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7.tar.gz 1066 BLAKE2B 15c502a85587ed58eb293667116bea860d9ac4986f3b0f13c695cf7de922a1cb1f574c4ae036e63e9caa56d93ba84055ce44eff862a8671d70a35ca681032970 SHA512 12668278478ea7e321ddaf46beb766d5607a9446a108550400c129754f7a701673e4331dc47336d75dab3d403d371656e72ce80555adc36d5ca708420fdb72c4
+DIST github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz 15185 BLAKE2B ba0e6cb42e67fddde9d4454c5757128842290daf6356bf44e05112d3759ef9373ae6ac7b82909f3cef7a31ac2b2612fc222861ca3f65190b24f80da9e2e0fa8e SHA512 48aa8d3e5795dc1d16486a1c418b60e51da254091081bc82116a66a7eac277c34814e0d8e598a7946dfbbc851b94a31d6d7e8032eb427bd858a5c3f56d3edbfd
+DIST github.com-pborman-uuid-e533369306653d193b93dae055f6083cbf8ba54f.tar.gz 13157 BLAKE2B cc68f4a5f2d1e753d9aa471a4f5cde6dc38cc88b8e4558068701415d89cb7410b79ebd39a77152848b4f30d6af05dbb07c5a9b0c469822ef703d7419c9281b7a SHA512 e1142c36ee10c31c35dd82fec40376f83540cd2b30a0e250e83fcc1aa2f4133cd13c76338c82e6619760fada05be5b62b87ac7958bdcca736459dbb77535a4d0
+DIST github.com-rogpeppe-fastuuid-6724a57986aff9bff1a1770e9347036def7c89f6.tar.gz 2506 BLAKE2B 457d346a717b9ca9b5374369810a11d5e298949d6681e28a0e8cffca1e3e7d160eb67c3d607aae224f0865ec4ed4b0b21c11d9f316295f31efdf21cf4f70bf8a SHA512 ab6c7d2e32d9b72b4495e9465c03b0b97e1a869f464eb49f3eb522cb04f65b2a45f5359a52ce71af2f59cfd986e0d58a0a76dc02c2583ac46eb0e33efd425dd7
+DIST github.com-stretchr-testify-2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz 94502 BLAKE2B 11d7fda9655c364de7c05a1ff0a2ead4b18261b016be89d66f118c6afdba7795bf55b54af64090121a0f789ce8708a85000298a5f032d3d578c36483bf64ae03 SHA512 b54e5d558d8419f1a5110c9803d8d120056264b4ccf0119207c1461a650c1a48fad35b4a6fdb681459be51f8bd6a728097e6c7c86bce0c0d828234aea6953ee0
+DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 BLAKE2B 584e75a9c47d28498aedb5c85b3409c79c84ec9fc47a5a9dc77aa117b4e48f681f72a12a03fafa566a405def40b4961bb7343cad0c6ecb3cd9da883a51ed20d6 SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae
+DIST lxd-2.21.tar.gz 882352 BLAKE2B 80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b SHA512 9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e
DIST lxd-3.1.tar.gz 27979442 BLAKE2B 0b74e3f76a7ab835b042b52b469a6fe11e7077d567e0658d13fab2192fd25d99518d65ba319c981a2e4677319e280cccae26f70ef99e9911264dc028ca5628fd SHA512 61f64d08dd80f7f676f386912f4dfc0d0af38cce0287de7865123b9da667b54ab91d22b76ffe03480e04ae0fbd8dc837d7d519d0e34409377c3d7e6624bf636c
DIST lxd-3.2.tar.gz 28183660 BLAKE2B 9aabc9fd0bd66d3b4e0178448a65ca39c69e4e7a14d01309e0e023501de1c17b2b7887a9da5b84fcfde27db3f521cce3451beace9955232da9bd5e5136bc0043 SHA512 82c37e87d75e328a29b1f2876a24fedec43a253bb72f3ea55fa9cdb928d11947eda723a01e758f90ef77ed4492f86ec6dd5f1f88240d05e771d926dfdc9888fb
diff --git a/app-emulation/lxd/files/lxd-dont-go-get.patch b/app-emulation/lxd/files/lxd-dont-go-get.patch
new file mode 100644
index 00000000000..a6e25e325b9
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-dont-go-get.patch
@@ -0,0 +1,16 @@
+--- /src/github.com/lxc/lxd/Makefile.orig 2016-07-11 23:34:40.299664675 +0000
++++ /src/github.com/lxc/lxd/Makefile 2016-07-11 23:37:00.816018727 +0000
+@@ -13,13 +13,11 @@
+
+ .PHONY: default
+ default:
+- go get -t -v -d ./...
+ go install -v $(TAGS) $(DEBUG) ./...
+ @echo "LXD built successfully"
+
+ .PHONY: client
+ client:
+- go get -t -v -d ./...
+ go install -v $(TAGS) $(DEBUG) ./lxc
+ @echo "LXD client built successfully"
+
diff --git a/app-emulation/lxd/files/lxd.confd b/app-emulation/lxd/files/lxd.confd
new file mode 100644
index 00000000000..3d553276a5e
--- /dev/null
+++ b/app-emulation/lxd/files/lxd.confd
@@ -0,0 +1,27 @@
+# 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"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/lxd-2.21.ebuild b/app-emulation/lxd/lxd-2.21.ebuild
new file mode 100644
index 00000000000..caefa812216
--- /dev/null
+++ b/app-emulation/lxd/lxd-2.21.ebuild
@@ -0,0 +1,224 @@
+# 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/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
+# The "# branch" comments are there for the script, they're important.
+EGO_VENDOR=(
+ "github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
+ "github.com/dustinkirkland/golang-petname d3c2ba80e75eeef10c5cf2fc76d2c809637376b3"
+ "github.com/juju/gomaasapi 663f786f595ba1707f56f62f7f4f2284c47c0f1d"
+ "github.com/juju/loggo 8232ab8918d91c72af1a9fb94d3edbe31d88b790"
+ "github.com/juju/persistent-cookiejar d5e5a8405ef9633c84af42fbcc734ec8dd73c198"
+ "github.com/juju/utils 4d9b38694f1e441c16421e2320f2b2fbd97fa597"
+ "github.com/juju/idmclient 15392b0e99abe5983297959c737b8d000e43b34c"
+ "github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
+ "github.com/juju/go4 40d72ab9641a2a8c36a9c46a51e28367115c8e59"
+ "github.com/juju/httprequest 77d36ac4b71a6095506c0617d5881846478558cb"
+ "github.com/juju/version 1f41e27e54f21acccf9b2dddae063a782a8a7ceb"
+ "github.com/juju/webbrowser 54b8c57083b4afb7dc75da7f13e2967b2606a507"
+ "github.com/juju/schema e4e05803c9a103fdfa880476044100ac17e54830"
+ "github.com/gorilla/websocket cdedf21e585dae942951e34d6defc3215b4280fa"
+ "github.com/gorilla/mux 5ab525f4fb1678e197ae59401e9050fa0b6cb5fd"
+ "github.com/mpvl/subtest f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7"
+ "github.com/olekukonko/tablewriter 65fec0d89a572b4367094e2058d3ebe667de3b60"
+ "github.com/golang/protobuf 1e59b77b52bf8e4b449a57e6f79f21226d571845"
+ "github.com/julienschmidt/httprouter e1b9828bc9e5904baec057a154c09ca40fe7fae0"
+ "github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
+ "github.com/stretchr/testify 2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"
+ "github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
+ "github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
+ "github.com/mattn/go-colorable 6fcc0c1fd9b620311d821b106a400b35dc95c497"
+ "github.com/mattn/go-sqlite3 d5ffb5c0cca8778699a929b236766f4a7af674e8"
+ "github.com/rogpeppe/fastuuid 6724a57986aff9bff1a1770e9347036def7c89f6"
+ "github.com/pborman/uuid e533369306653d193b93dae055f6083cbf8ba54f"
+ "github.com/lxc/lxd a324ad91230e5353fe746d06636dc59211122e6c"
+ "golang.org/x/crypto d585fd2cc9195196078f516b69daff6744ef5e84 github.com/golang/crypto"
+ "golang.org/x/net d866cfc389cec985d6fda2859936a575a55a3ab6 github.com/golang/net"
+ "golang.org/x/sys 571f7bbbe08da2a8955aed9d4db316e78630e9a3 github.com/golang/sys"
+ "gopkg.in/retry.v1 01631078ef2fdce601e38cfe5f527fab24c9a6d2 github.com/go-retry/retry" # branch v1
+ "gopkg.in/macaroon.v2 bed2a428da6e56d950bed5b41fcbae3141e5b0d0 github.com/go-macaroon/macaroon" # branch v2
+ "gopkg.in/yaml.v2 287cf08546ab5e7e37d55a84f7ed3fd1db036de5 github.com/go-yaml/yaml" # branch v2
+ "gopkg.in/juju/names.v2 54f00845ae470a362430a966fe17f35f8784ac92 github.com/juju/names" # branch v2
+ "gopkg.in/juju/environschema.v1 7359fc7857abe2b11b5b3e23811a9c64cb6b01e0 github.com/juju/environschema" # branch v1
+ "gopkg.in/macaroon-bakery.v2 ec9d2ad6796100720c154f614b6dea8798ec1181 github.com/go-macaroon-bakery/macaroon-bakery" # branch v2
+ "gopkg.in/httprequest.v1 fdaf1bffa25560ba0920e3e29aae85d3677ab32e github.com/go-httprequest/httprequest" # branch v1
+ "gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2" # branch v3.0
+ "gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655 github.com/go-mgo/mgo" # branch v2
+ "gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb" # branch v2
+ "gopkg.in/errgo.v1 442357a80af5c6bf9b6d51ae791a39c3421004f3 github.com/go-errgo/errgo" # branch v1
+ "gopkg.in/lxc/go-lxc.v2 a7d112aed2f5f57f565d6e557671eeef7e76811c github.com/lxc/go-lxc" # branch v2
+)
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test"
+
+inherit bash-completion-r1 linux-info systemd user golang-vcs-snapshot
+
+SRC_URI="${ARCHIVE_URI}
+ ${EGO_VENDOR_URI}"
+
+DEPEND="
+ >=dev-lang/go-1.7.1
+ dev-libs/protobuf
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-arch/xz-utils
+ >=app-emulation/lxc-2.0.7[seccomp]
+ dnsmasq? (
+ net-dns/dnsmasq[dhcp,ipv6?]
+ )
+ net-misc/rsync[xattr]
+ sys-apps/iproute2[ipv6?]
+ 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"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-dont-go-get.patch"
+)
+
+src_prepare() {
+ default_src_prepare
+
+ # Examples in go-lxc make our build fail.
+ rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ tmpgoroot="${T}/goroot"
+ if use daemon; then
+ # Build binaries
+ emake
+ else
+ # build client tool
+ emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ export GOPATH="${S}"
+ cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+ emake check
+ else
+ einfo "No tests to run for client-only builds"
+ fi
+}
+
+src_install() {
+ dobin bin/lxc
+ if use daemon; then
+ dosbin bin/lxd
+ dobin bin/fuidshift
+ fi
+
+ cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
+
+ 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 config/bash/lxd-client lxc
+
+ dodoc AUTHORS README.md doc/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "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)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/lxcfs"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+ einfo
+ einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+ einfo "a patched kernel and iproute2."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2018-10-13 22:47 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2018-10-13 22:47 UTC (permalink / raw
To: gentoo-commits
commit: 6aaccc67a3c6fc22b12ef573a2626b8d9d32e19d
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 22:47:26 2018 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 22:47:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aaccc67
app-emulation/lxd: Remove old versions
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-emulation/lxd/Manifest | 2 -
.../lxd/files/de-translation-newline.patch | 20 --
.../lxd/files/ja-translation-newline.patch | 11 -
app-emulation/lxd/files/lxd.initd.1 | 47 -----
app-emulation/lxd/lxd-3.3.ebuild | 183 ----------------
app-emulation/lxd/lxd-3.4-r1.ebuild | 233 ---------------------
app-emulation/lxd/lxd-3.4.ebuild | 232 --------------------
7 files changed, 728 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index e2d85aa69e4..57a31c22485 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1 @@
-DIST lxd-3.3.tar.gz 28414680 BLAKE2B 7f3eecf400761548935e6e3c81d894379cd667ffbe6d8ef67a7dd3ad4f1c13846f524fcefc4cdc306674fb990706bda0b2c4ef390f320c41561fa86cf610586c SHA512 ed5d792c1080f2be7f48f34051fbfa28d138b4ccb5405edb13cd630776ec34312da491a1881f77dddbe1a121e589b44952e73ce1e61f2cba72243f3b8f4c0177
-DIST lxd-3.4.tar.gz 24313641 BLAKE2B 6f2db8a690474d020a0d43366e940760c0886c8af60e17ecc6bf1f9747d8454d09d619b723b1794bec503dda82028f7d81edc2d0c33216cbad9c810f2657198d SHA512 f041878fcfd2b45f594d97e748272d44c517f28e181861a604bef23f858c4bd59cc93ac56c24cce6d353743428b66940f11df268ff9f66e83a5c8f1fb95dc3aa
DIST lxd-3.5.tar.gz 28356957 BLAKE2B 44334026ed720cc9d8a16a0752abb102f07b186e9a5946ffce9872734d166a6d477e0dd324002f74c2cca36bc500f7def9ff7f358c7d07792124392ab815e07c SHA512 56f10a75ee2cfb6ed653e2d69dee979b0a661f267bc66ab642e5fc1835d1879e7df600671325973d9772ddc653334531f2420f129c06cdb5a93950083263f366
diff --git a/app-emulation/lxd/files/de-translation-newline.patch b/app-emulation/lxd/files/de-translation-newline.patch
deleted file mode 100644
index 9ef55ab2f0e..00000000000
--- a/app-emulation/lxd/files/de-translation-newline.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /po/de.po 2018-06-27 19:57:56.759130047 -0500
-+++ /po/de.po 2018-06-27 20:01:09.694634346 -0500
-@@ -65,7 +65,7 @@
- "### type: custom\n"
- "### used_by: []\n"
- "### config:\n"
--"### size: \"61203283968\""
-+"### size: \"61203283968\"\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Abbildes in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"
-@@ -167,7 +167,7 @@
- "###\n"
- "### Each property is represented by a single line:\n"
- "### An example would be:\n"
--"### description: My custom image"
-+"### description: My custom image\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"
diff --git a/app-emulation/lxd/files/ja-translation-newline.patch b/app-emulation/lxd/files/ja-translation-newline.patch
deleted file mode 100644
index bbda24c6f37..00000000000
--- a/app-emulation/lxd/files/ja-translation-newline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /po/ja.po 2018-05-20 19:42:38.932990198 -0500
-+++ /po/ja.po 2018-05-20 19:42:55.839944861 -0500
-@@ -1380,7 +1380,7 @@
- "イメージのエイリアスを一覧表示します\n"
- "\n"
- "指定するフィルタはイメージのハッシュ値の一部でもイメージのエイリアスの一部で"
--"も構いません。"
-+"も構いません。\n"
-
- #: lxc/image.go:888
- msgid "List images"
diff --git a/app-emulation/lxd/files/lxd.initd.1 b/app-emulation/lxd/files/lxd.initd.1
deleted file mode 100644
index b6d3cd4eb26..00000000000
--- a/app-emulation/lxd/files/lxd.initd.1
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-}
-
-start() {
- ebegin "Starting lxd service"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- --env LD_LIBRARY_PATH="/usr/lib/lxd" \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/lxd-3.3.ebuild b/app-emulation/lxd/lxd-3.3.ebuild
deleted file mode 100644
index 393042c8ae5..00000000000
--- a/app-emulation/lxd/lxd-3.3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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"
-
-inherit bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-DEPEND="
- >=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]
- dnsmasq? (
- net-dns/dnsmasq[dhcp,ipv6?]
- )
- net-misc/rsync[xattr]
- sys-apps/iproute2[ipv6?]
- 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"
-
-PATCHES=(
- "${FILESDIR}/ja-translation-newline.patch" # https://github.com/lxc/lxd/pull/4572
- "${FILESDIR}/de-translation-newline.patch"
-)
-
-# LXD tarball is packaged with a nice "dist" folder containing all dependencies
-# that were vendored by upstream at release time. That saves us the trouble of
-# vendoring the dependencies ourselves. This is why there was this drastic drop
-# in ebuild complexity compared to pre 3.0.0-r2 ebuilds.
-src_compile() {
- export GOPATH="${S}/dist"
-
- # 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.
- #
- # ABOUT "-tags libsqlite3": we used to link to the system's sqlite3 library
- # but since v3.0.0, LXD depends on github.com/CanonicalLtd/dqlite which
- # at the time of this writing, depends on patched version of sqlite with
- # replication capabilities added. We don't have that patch in dev-db/sqlite.
- # Therefore, we let LXD use its own private copy of sqlite.
- go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
-
- if use daemon; then
- go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
- go install -v -x ${EGO_PN}/lxd || die "Failed to build the daemon"
- 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
- dosbin ${bindir}/lxd
- dobin ${bindir}/fuidshift
- 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 README.md doc/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "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)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
- einfo
- einfo "Be sure to add your local user to the lxd group."
- einfo
- einfo "Networks with bridge.mode=fan are unsupported due to requiring"
- einfo "a patched kernel and iproute2."
-}
diff --git a/app-emulation/lxd/lxd-3.4-r1.ebuild b/app-emulation/lxd/lxd-3.4-r1.ebuild
deleted file mode 100644
index 0988eae3ecc..00000000000
--- a/app-emulation/lxd/lxd-3.4-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# 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
diff --git a/app-emulation/lxd/lxd-3.4.ebuild b/app-emulation/lxd/lxd-3.4.ebuild
deleted file mode 100644
index c5ce43a9eb1..00000000000
--- a/app-emulation/lxd/lxd-3.4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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/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=/usr/lib/lxd
-
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
- PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=/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/"
- 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.1 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
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2018-10-14 4:36 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2018-10-14 4:36 UTC (permalink / raw
To: gentoo-commits
commit: 72bf039f5ed8c88ec658e19516bab07f77828c8a
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 04:36:01 2018 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 04:36:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72bf039f
app-emulation/lxd: Bump to 3.6
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-emulation/lxd/Manifest | 1 +
.../lxd/files/ptbr-translation-newline.patch | 19 ++
app-emulation/lxd/lxd-3.6.ebuild | 238 +++++++++++++++++++++
3 files changed, 258 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 57a31c22485..92740d8c352 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1 +1,2 @@
DIST lxd-3.5.tar.gz 28356957 BLAKE2B 44334026ed720cc9d8a16a0752abb102f07b186e9a5946ffce9872734d166a6d477e0dd324002f74c2cca36bc500f7def9ff7f358c7d07792124392ab815e07c SHA512 56f10a75ee2cfb6ed653e2d69dee979b0a661f267bc66ab642e5fc1835d1879e7df600671325973d9772ddc653334531f2420f129c06cdb5a93950083263f366
+DIST lxd-3.6.tar.gz 25777268 BLAKE2B f2c3f20108f5990b1e086d1f5db53cbd476d0613f97f60a29dd66d3779486aef10f9eebf514853960d5606a108aea2e7c89365207130e8345ede70ed5b22806e SHA512 7b1982b81cfee56185bc0929b7bd9f1eb705c1ae83f11fa6f9aa2c9f8fc9aa5c705112121b41e5ed3791aa2ab41be26d7f8fb0a78951bab382b77ae9ae95a793
diff --git a/app-emulation/lxd/files/ptbr-translation-newline.patch b/app-emulation/lxd/files/ptbr-translation-newline.patch
new file mode 100644
index 00000000000..92d78ca1427
--- /dev/null
+++ b/app-emulation/lxd/files/ptbr-translation-newline.patch
@@ -0,0 +1,19 @@
+--- /po/pt_BR.po.orig 2018-10-13 23:27:01.523645894 -0500
++++ /po/pt_BR.po 2018-10-13 23:28:04.730644762 -0500
+@@ -95,7 +95,6 @@
+ "###\n"
+ "### Note that the name is shown but cannot be changed"
+ msgstr ""
+-"\n"
+ "### Esta é uma representação em yaml da configuração.\n"
+ "### Qualquer linha começando com '#' será ignorada.\n"
+ "###\n"
+@@ -112,7 +111,7 @@
+ "### type: disk\n"
+ "### ephemeral: false\n"
+ "###\n"
+-"### Observe que o nome é exibido mas não pode ser modificado\n"
++"### Observe que o nome é exibido mas não pode ser modificado"
+
+ #: lxc/config_metadata.go:63
+ msgid ""
diff --git a/app-emulation/lxd/lxd-3.6.ebuild b/app-emulation/lxd/lxd-3.6.ebuild
new file mode 100644
index 00000000000..52e97dfade6
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.6.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/libuv
+ 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-1.patch"
+ eapply "${FILESDIR}/ptbr-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
+# - maybe implement LXD_CLUSTER_UPDATE per
+# https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
+# EM I'm not convinced it's a good design.
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2019-09-09 2:58 Erik Mackdanz
0 siblings, 0 replies; 31+ messages in thread
From: Erik Mackdanz @ 2019-09-09 2:58 UTC (permalink / raw
To: gentoo-commits
commit: 2758f7b24ebd2d60d2a552c0fd3b2c01dea6cdf0
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 8 22:50:32 2019 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Sep 9 02:57:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2758f7b2
app-emulation/lxd: Remove old
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.73, Repoman-2.3.17
app-emulation/lxd/Manifest | 1 -
.../lxd/files/ptbr-translation-newline.patch | 19 --
app-emulation/lxd/lxd-3.12.ebuild | 241 ---------------------
3 files changed, 261 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 94f485cced0..ffff6a388ba 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1 @@
-DIST lxd-3.12.tar.gz 27365315 BLAKE2B 2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0 SHA512 fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e
DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
diff --git a/app-emulation/lxd/files/ptbr-translation-newline.patch b/app-emulation/lxd/files/ptbr-translation-newline.patch
deleted file mode 100644
index 92d78ca1427..00000000000
--- a/app-emulation/lxd/files/ptbr-translation-newline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- /po/pt_BR.po.orig 2018-10-13 23:27:01.523645894 -0500
-+++ /po/pt_BR.po 2018-10-13 23:28:04.730644762 -0500
-@@ -95,7 +95,6 @@
- "###\n"
- "### Note that the name is shown but cannot be changed"
- msgstr ""
--"\n"
- "### Esta é uma representação em yaml da configuração.\n"
- "### Qualquer linha começando com '#' será ignorada.\n"
- "###\n"
-@@ -112,7 +111,7 @@
- "### type: disk\n"
- "### ephemeral: false\n"
- "###\n"
--"### Observe que o nome é exibido mas não pode ser modificado\n"
-+"### Observe que o nome é exibido mas não pode ser modificado"
-
- #: lxc/config_metadata.go:63
- msgid ""
diff --git a/app-emulation/lxd/lxd-3.12.ebuild b/app-emulation/lxd/lxd-3.12.ebuild
deleted file mode 100644
index a330cfbac4e..00000000000
--- a/app-emulation/lxd/lxd-3.12.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo 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="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/libuv
- 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-libs/libnsl:0=
- 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-1.patch"
- eapply "${FILESDIR}/ptbr-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" LDFLAGS="-L${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"
- go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c"
- 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
- dobin ${bindir}/lxd-p2c
- 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
-# - maybe implement LXD_CLUSTER_UPDATE per
-# https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
-# EM I'm not convinced it's a good design.
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2020-05-15 5:20 Joonas Niilola
0 siblings, 0 replies; 31+ messages in thread
From: Joonas Niilola @ 2020-05-15 5:20 UTC (permalink / raw
To: gentoo-commits
commit: a7d7c673797b5ff17c5a28b9d1a131d000cac3d7
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 15:56:05 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 15 05:20:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d7c673
app-emulation/lxd: bump to 4.0.1, LTS channel
- always install daemon and tools,
- port to GLEP-81 acct.
Closes: https://bugs.gentoo.org/701248
Closes: https://bugs.gentoo.org/716632
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-4.0.0.confd | 23 ++++
app-emulation/lxd/files/lxd-4.0.0.initd | 54 +++++++++
app-emulation/lxd/lxd-4.0.1.ebuild | 202 ++++++++++++++++++++++++++++++++
4 files changed, 280 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index f0a03569d10..5c5d670606b 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
DIST lxd-3.16.tar.gz 24863601 BLAKE2B 0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9 SHA512 11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
+DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920 SHA512 1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
diff --git a/app-emulation/lxd/files/lxd-4.0.0.confd b/app-emulation/lxd/files/lxd-4.0.0.confd
new file mode 100644
index 00000000000..68cf344995b
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0.confd
@@ -0,0 +1,23 @@
+# 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
new file mode 100644
index 00000000000..03ec12e44f5
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+TIMEOUT=10
+
+extra_commands="stopall"
+
+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_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
+ stopall
+ else
+ ebegin "Stopping lxd service (but not containers)."
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend ${?}
+ fi
+}
+
+stopall() {
+ ebegin "Stopping lxd service and containers."
+ lxc stop --all --timeout $TIMEOUT >/dev/null 2>&1
+ if [[ ${?} -ne 0 ]]; then
+ lxc stop --all --force || eerror "Could not stop all containers."
+ fi
+ if "${DAEMON}" shutdown; then
+ rm -f ${PIDFILE}
+ eend 0
+ fi
+ eend ${?}
+}
diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild
new file mode 100644
index 00000000000..876dcde968a
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -0,0 +1,202 @@
+# 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.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ipv6 nls"
+
+DEPEND="app-arch/xz-utils
+ >=app-emulation/lxc-3.0.0[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_IPV4
+ ~NF_NAT_MASQUERADE_IPV6
+ ~VXLAN
+"
+
+# To no one's surprise 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
+
+ sed -i \
+ -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
+ -e "s:make:make ${MAKEOPTS}:g" \
+ Makefile || die
+
+ cd "${GOPATH}"/deps/libco || die
+ sed -i 's#lib$#lib/lxd#' Makefile || 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}"/${PN}-4.0.0.confd lxd
+ newinitd "${FILESDIR}"/${PN}-4.0.0.initd lxd
+
+ systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+
+ 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 "apparmor support" app-emulation/lxc[apparmor]
+ 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."
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2020-08-12 13:03 Joonas Niilola
0 siblings, 0 replies; 31+ messages in thread
From: Joonas Niilola @ 2020-08-12 13:03 UTC (permalink / raw
To: gentoo-commits
commit: a6d431a990c249ae48c8cde1b7246d30f50a9acb
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 12:55:38 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 13:03:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d431a9
app-emulation/lxd: remove old 4.0.1
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-emulation/lxd/Manifest | 1 -
app-emulation/lxd/files/lxd-4.0.1-clang.patch | 76 ----------
app-emulation/lxd/files/lxd.service | 10 --
app-emulation/lxd/lxd-4.0.1.ebuild | 206 --------------------------
4 files changed, 293 deletions(-)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 621644c18ae..e491542f828 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1 @@
-DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920 SHA512 1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
DIST lxd-4.0.2.tar.gz 25350601 BLAKE2B 2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad SHA512 6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077
diff --git a/app-emulation/lxd/files/lxd-4.0.1-clang.patch b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
deleted file mode 100644
index 765f2f38be5..00000000000
--- a/app-emulation/lxd/files/lxd-4.0.1-clang.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c7ce94825871ea5d0946e92762e981354628b8ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
-Date: Mon, 22 Jun 2020 22:17:02 -0400
-Subject: [PATCH] lxd: Fix building with clang
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Closes #7573
-
-Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
----
- lxd/main_forksyscall.go | 8 --------
- lxd/seccomp/seccomp.go | 16 ++++++++--------
- 2 files changed, 8 insertions(+), 16 deletions(-)
-
-diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
-index a304405c2e..14895b6ce0 100644
---- a/lxd/main_forksyscall.go
-+++ b/lxd/main_forksyscall.go
-@@ -34,12 +34,6 @@ extern void attach_userns_fd(int ns_fd);
- extern int pidfd_nsfd(int pidfd, pid_t pid);
- extern bool setnsat(int ns_fd, const char *ns);
-
--static inline bool same_fsinfo(struct stat *s1, struct stat *s2,
-- struct statfs *sfs1, struct statfs *sfs2)
--{
-- return ((sfs1->f_type == sfs2->f_type) && (s1->st_dev == s2->st_dev));
--}
--
- static bool chdirchroot_in_mntns(int cwd_fd, int root_fd)
- {
- ssize_t len;
-@@ -209,8 +203,6 @@ const char *ns_names[] = { "user", "pid", "uts", "ipc", "net", "cgroup", NULL };
-
- static bool change_creds(int ns_fd, cap_t caps, uid_t nsuid, gid_t nsgid, uid_t nsfsuid, gid_t nsfsgid)
- {
-- __do_close int fd = -EBADF;
--
- if (prctl(PR_SET_KEEPCAPS, 1))
- return false;
-
-diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
-index 8945fd9197..025efb3141 100644
---- a/lxd/seccomp/seccomp.go
-+++ b/lxd/seccomp/seccomp.go
-@@ -91,21 +91,21 @@ static int device_allowed(dev_t dev, mode_t mode)
- {
- switch (mode & S_IFMT) {
- case S_IFCHR:
-- if ((dev == makedev(0, 0))) // whiteout
-+ if (dev == makedev(0, 0)) // whiteout
- return 0;
-- else if ((dev == makedev(5, 1))) // /dev/console
-+ else if (dev == makedev(5, 1)) // /dev/console
- return 0;
-- else if ((dev == makedev(1, 7))) // /dev/full
-+ else if (dev == makedev(1, 7)) // /dev/full
- return 0;
-- else if ((dev == makedev(1, 3))) // /dev/null
-+ else if (dev == makedev(1, 3)) // /dev/null
- return 0;
-- else if ((dev == makedev(1, 8))) // /dev/random
-+ else if (dev == makedev(1, 8)) // /dev/random
- return 0;
-- else if ((dev == makedev(5, 0))) // /dev/tty
-+ else if (dev == makedev(5, 0)) // /dev/tty
- return 0;
-- else if ((dev == makedev(1, 9))) // /dev/urandom
-+ else if (dev == makedev(1, 9)) // /dev/urandom
- return 0;
-- else if ((dev == makedev(1, 5))) // /dev/zero
-+ else if (dev == makedev(1, 5)) // /dev/zero
- return 0;
- }
-
diff --git a/app-emulation/lxd/files/lxd.service b/app-emulation/lxd/files/lxd.service
deleted file mode 100644
index d00635fbcdd..00000000000
--- a/app-emulation/lxd/files/lxd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Container hypervisor based on LXC
-
-[Service]
-ExecStart=/usr/sbin/lxd --group lxd
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild
deleted file mode 100644
index 578a64630a1..00000000000
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ /dev/null
@@ -1,206 +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.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+ipv6 nls"
-
-DEPEND="app-arch/xz-utils
- >=app-emulation/lxc-3.0.0[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_IPV4
- ~NF_NAT_MASQUERADE_IPV6
- ~VXLAN
-"
-
-# To no one's surprise 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
-
-PATCHES=( "${FILESDIR}"/lxd-4.0.1-clang.patch )
-
-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}"/${PN}-4.0.0.confd lxd
- newinitd "${FILESDIR}"/${PN}-4.0.0.initd lxd
-
- systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-
- 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 "apparmor support" app-emulation/lxc[apparmor]
- 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."
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
@ 2020-10-26 6:30 Joonas Niilola
0 siblings, 0 replies; 31+ messages in thread
From: Joonas Niilola @ 2020-10-26 6:30 UTC (permalink / raw
To: gentoo-commits
commit: 1e6334d771a7f7b7b38c8221a5649f2e81c5ce8a
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 06:25:22 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 06:29:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6334d7
app-emulation/lxd: revert openrc -> systemd-cgroups fix
- it now breaks openrc -> openrc-cgroups instead. A better solution needs to
be found. Please see
https://wiki.gentoo.org/wiki/LXD#Running_systemd_based_containers_on_OpenRC_hosts
for a workaround, that you can add to your own init.d file if needed.
Bug: https://bugs.gentoo.org/750410
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-emulation/lxd/files/lxd-4.0.0.initd | 3 ---
app-emulation/lxd/{lxd-4.0.3-r1.ebuild => lxd-4.0.3-r2.ebuild} | 0
app-emulation/lxd/{lxd-4.0.4.ebuild => lxd-4.0.4-r1.ebuild} | 0
3 files changed, 3 deletions(-)
diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index f4206344355..03ec12e44f5 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -18,9 +18,6 @@ start() {
modprobe -f loop > /dev/null 2>&1
- # Allow systemd containers to be used on openrc host, #750410
- [ -d /sys/fs/cgroup/systemd ] || ( mkdir -p /sys/fs/cgroup/systemd ; mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd )
-
# 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 \
diff --git a/app-emulation/lxd/lxd-4.0.3-r1.ebuild b/app-emulation/lxd/lxd-4.0.3-r2.ebuild
similarity index 100%
rename from app-emulation/lxd/lxd-4.0.3-r1.ebuild
rename to app-emulation/lxd/lxd-4.0.3-r2.ebuild
diff --git a/app-emulation/lxd/lxd-4.0.4.ebuild b/app-emulation/lxd/lxd-4.0.4-r1.ebuild
similarity index 100%
rename from app-emulation/lxd/lxd-4.0.4.ebuild
rename to app-emulation/lxd/lxd-4.0.4-r1.ebuild
^ permalink raw reply related [flat|nested] 31+ messages in thread
end of thread, other threads:[~2020-10-26 6:30 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-15 3:13 [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/ Erik Mackdanz
-- strict thread matches above, loose matches on Subject: below --
2020-10-26 6:30 Joonas Niilola
2020-08-12 13:03 Joonas Niilola
2020-05-15 5:20 Joonas Niilola
2019-09-09 2:58 Erik Mackdanz
2018-10-14 4:36 Erik Mackdanz
2018-10-13 22:47 Erik Mackdanz
2018-07-03 12:23 Virgil Dupras
2018-05-21 1:29 Erik Mackdanz
2018-04-08 20:05 Erik Mackdanz
2017-09-24 11:18 Agostino Sarubbo
2017-09-24 11:18 Agostino Sarubbo
2017-08-19 13:45 Patrice Clement
2017-01-03 14:04 Erik Mackdanz
2016-10-29 4:32 Erik Mackdanz
2016-07-12 23:57 Erik Mackdanz
2016-07-12 23:54 Erik Mackdanz
2016-06-13 15:42 Erik Mackdanz
2016-04-14 3:46 Erik Mackdanz
2016-03-08 9:43 Erik Mackdanz
2016-02-28 18:03 Erik Mackdanz
2016-02-20 14:37 Erik Mackdanz
2016-02-19 3:12 Erik Mackdanz
2016-02-03 23:53 Erik Mackdanz
2016-01-25 0:07 Erik Mackdanz
2015-12-12 5:41 Erik Mackdanz
2015-11-27 18:05 Erik Mackdanz
2015-11-12 15:56 Erik Mackdanz
2015-10-18 5:26 Erik Mackdanz
2015-10-18 5:21 Erik Mackdanz
2015-09-05 21:49 Alex Brandt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox