diff options
| -rw-r--r-- | app-emulation/lxd/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-2.5-dont-go-get.patch | 22 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-2.5.confd | 27 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-2.5.initd | 49 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-2.7-dont-go-get.patch | 22 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-2.7.confd | 27 | ||||
| -rw-r--r-- | app-emulation/lxd/files/lxd-2.7.initd | 49 | ||||
| -rw-r--r-- | app-emulation/lxd/lxd-2.5.ebuild | 194 | ||||
| -rw-r--r-- | app-emulation/lxd/lxd-2.7.ebuild | 198 |
9 files changed, 0 insertions, 590 deletions
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index 53b58ba48e19..dba7edb0899d 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -1,4 +1,2 @@ DIST lxd-2.11.tar.bz2 2407968 SHA256 829643811a711c8e3c118274d517091b4fbd4701b760e46d7f53fcc4d356455d SHA512 8269a20e0c0c0f3a3a247af15fcda3aa764cd2353d8a7aa9183646dbf19a080ce09bf31ff91a9faca3eda494460a788deabdb145a59c2aa1861f2df89c43294b WHIRLPOOL ba12b4c41969e17b5f9beaa7908ca7be18d3ce35ae27c762a556fe6d59f48962cf0ccaecc512887d40338e6e26ccdc2cdf6c89d87fd1b2028fb5e04f3a74b639 -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 DIST lxd-2.8.tar.bz2 2317466 SHA256 57f08bd3c26ea4f32453aa163b502301ae0a80716d6de56b069eeebb35850011 SHA512 fdf906add25ab0b79ea7669ad569873a256f0cfc220ed816b0dc2c9b1e525a19e2606678d90d50c4f548b4322a2896d4c12069337f9571a9a4f6646fb6f673a5 WHIRLPOOL 049f3664e60e8f6fd98c8403db31db6e1dd5f6efed2e74b9007f9f99a4b337e9f58852253d226fc294c4bc964dd6d5d732a8a386606f206a74d83a32470dc1d3 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 deleted file mode 100644 index 9402de57735a..000000000000 --- a/app-emulation/lxd/files/lxd-2.5-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.5.confd b/app-emulation/lxd/files/lxd-2.5.confd deleted file mode 100644 index 3d553276a5e3..000000000000 --- a/app-emulation/lxd/files/lxd-2.5.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.5.initd b/app-emulation/lxd/files/lxd-2.5.initd deleted file mode 100644 index 9a9d623a278a..000000000000 --- a/app-emulation/lxd/files/lxd-2.5.initd +++ /dev/null @@ -1,49 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 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 - - # 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.7-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.7-dont-go-get.patch deleted file mode 100644 index 9402de57735a..000000000000 --- a/app-emulation/lxd/files/lxd-2.7-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.7.confd b/app-emulation/lxd/files/lxd-2.7.confd deleted file mode 100644 index 3d553276a5e3..000000000000 --- a/app-emulation/lxd/files/lxd-2.7.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.7.initd b/app-emulation/lxd/files/lxd-2.7.initd deleted file mode 100644 index 42e764aa3f4d..000000000000 --- a/app-emulation/lxd/files/lxd-2.7.initd +++ /dev/null @@ -1,49 +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 - - # 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 deleted file mode 100644 index 044b202a8525..000000000000 --- a/app-emulation/lxd/lxd-2.5.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2016 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" - -# 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.7.ebuild b/app-emulation/lxd/lxd-2.7.ebuild deleted file mode 100644 index 219213d249ea..000000000000 --- a/app-emulation/lxd/lxd-2.7.ebuild +++ /dev/null @@ -1,198 +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" - -# 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-go/go-net - 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 - if use daemon; then - dosbin bin/lxd - dobin bin/fuidshift - 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/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." -} |