diff options
author | Erik Mackdanz <stasibear@gentoo.org> | 2015-11-12 09:59:22 -0600 |
---|---|---|
committer | Erik Mackdanz <stasibear@gentoo.org> | 2015-11-12 09:59:22 -0600 |
commit | 80541f09ef4b6a8cbe414add73c4cacf2dd95dd2 (patch) | |
tree | f0a01b3d63562589c133f115bc5d7d2b8d547c6c /app-emulation | |
parent | app-emulation/lxd: bump to 0.22 (diff) | |
download | gentoo-80541f09ef4b6a8cbe414add73c4cacf2dd95dd2.tar.gz gentoo-80541f09ef4b6a8cbe414add73c4cacf2dd95dd2.tar.bz2 gentoo-80541f09ef4b6a8cbe414add73c4cacf2dd95dd2.zip |
app-emulation/lxd: clean up old
Package-Manager: portage-2.2.24
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/lxd/Manifest | 1 | ||||
-rw-r--r-- | app-emulation/lxd/files/lxd-0.18-dont-go-get.patch | 18 | ||||
-rw-r--r-- | app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch | 11 | ||||
-rw-r--r-- | app-emulation/lxd/files/lxd-0.18.confd | 27 | ||||
-rw-r--r-- | app-emulation/lxd/files/lxd-0.18.initd | 32 | ||||
-rw-r--r-- | app-emulation/lxd/lxd-0.18.ebuild | 166 | ||||
-rw-r--r-- | app-emulation/lxd/metadata.xml | 11 |
7 files changed, 0 insertions, 266 deletions
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index 493bbac8553e..b8bca616b455 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -1,4 +1,3 @@ -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.18-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch deleted file mode 100644 index 1b229ea99cd5..000000000000 --- a/app-emulation/lxd/files/lxd-0.18-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.18-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch deleted file mode 100644 index b88b7f7e5082..000000000000 --- a/app-emulation/lxd/files/lxd-0.18-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.18.confd b/app-emulation/lxd/files/lxd-0.18.confd deleted file mode 100644 index 3d553276a5e3..000000000000 --- a/app-emulation/lxd/files/lxd-0.18.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.18.initd b/app-emulation/lxd/files/lxd-0.18.initd deleted file mode 100644 index 2b75e51c8a64..000000000000 --- a/app-emulation/lxd/files/lxd-0.18.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.18.ebuild b/app-emulation/lxd/lxd-0.18.ebuild deleted file mode 100644 index fd53d9860e50..000000000000 --- a/app-emulation/lxd/lxd-0.18.ebuild +++ /dev/null @@ -1,166 +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="btrfs +criu +daemon 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,seccomp] - net-analyzer/openbsd-netcat - net-misc/bridge-utils - net-misc/rsync[xattr] - sys-apps/iproute2 - virtual/acl - btrfs? ( - sys-fs/btrfs-progs - ) - criu? ( - sys-process/criu - ) - 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. -# - Add apparmor USE. There are some exec calls to apparmor_parser -# - Test build with Go 1.4 & 1.5 -# - 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) - - 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 -} diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml index 4dbb9e38ebd3..0ff516e1cadd 100644 --- a/app-emulation/lxd/metadata.xml +++ b/app-emulation/lxd/metadata.xml @@ -15,19 +15,8 @@ <remote-id type="github">lxc/lxd</remote-id> </upstream> <use> - <flag name="btrfs"> - Add support for managing instance/snapshot - disk using btrfs subvolumes - </flag> - <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="lvm"> - Allow using the Logical Volume Manager as pool - for disk image storage - </flag> </use> </pkgmetadata> |