From fcd3f868b93b6e707841fdce724155795071e1cd Mon Sep 17 00:00:00 2001 From: Erik Mackdanz Date: Wed, 3 Feb 2016 17:53:43 -0600 Subject: 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(+) create mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta1-disregard-dev-subdirs.patch create mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta1-dont-go-get.patch create mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta1-nc-binary-name.patch create mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta1.confd create mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta1.initd create mode 100644 app-emulation/lxd/lxd-2.0.0_beta1.ebuild (limited to 'app-emulation/lxd') diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index fcb60cb0191e..c887cbd34fb8 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 000000000000..9655e5ebb182 --- /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 000000000000..9964af6aec43 --- /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 000000000000..7373b66969b7 --- /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 000000000000..3d553276a5e3 --- /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 000000000000..ec23258c19d1 --- /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 000000000000..9ff9d906254e --- /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." +} -- cgit v1.2.3-18-g5258