From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6178259CA3 for ; Tue, 8 Mar 2016 09:43:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A46A21C06E; Tue, 8 Mar 2016 09:43:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9736C21C06E for ; Tue, 8 Mar 2016 09:43:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6575340906 for ; Tue, 8 Mar 2016 09:43:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2553A18A5 for ; Tue, 8 Mar 2016 09:43:28 +0000 (UTC) From: "Erik Mackdanz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Erik Mackdanz" Message-ID: <1457430252.4703eb07d3c02233ee6272c9cf4a82770a812ac9.stasibear@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/lxd/Manifest app-emulation/lxd/files/lxd-2.0.0_rc2-dont-go-get.patch app-emulation/lxd/files/lxd-2.0.0_rc2-nc-binary-name.patch app-emulation/lxd/files/lxd-2.0.0_rc2.confd app-emulation/lxd/files/lxd-2.0.0_rc2.initd app-emulation/lxd/lxd-2.0.0_rc2.ebuild X-VCS-Directories: app-emulation/lxd/ app-emulation/lxd/files/ X-VCS-Committer: stasibear X-VCS-Committer-Name: Erik Mackdanz X-VCS-Revision: 4703eb07d3c02233ee6272c9cf4a82770a812ac9 X-VCS-Branch: master Date: Tue, 8 Mar 2016 09:43:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 265f48a6-6613-4ff9-912d-370bda1e685f X-Archives-Hash: e7172990fa5b5d54198ba35eadf4d63d commit: 4703eb07d3c02233ee6272c9cf4a82770a812ac9 Author: Erik Mackdanz gentoo org> AuthorDate: Tue Mar 8 09:44:12 2016 +0000 Commit: Erik Mackdanz gentoo 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." +}