1 |
commit: bacef534c05eeb26852211afba0b4370c174f7fa |
2 |
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 25 00:10:32 2016 +0000 |
4 |
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 25 00:10:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacef534 |
7 |
|
8 |
app-emulation/lxd: remove old |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
app-emulation/lxd/Manifest | 1 - |
13 |
app-emulation/lxd/files/lxd-0.24-dont-go-get.patch | 18 --- |
14 |
.../lxd/files/lxd-0.24-nc-binary-name.patch | 11 -- |
15 |
app-emulation/lxd/files/lxd-0.24.confd | 27 ---- |
16 |
app-emulation/lxd/files/lxd-0.24.initd | 50 ------- |
17 |
app-emulation/lxd/lxd-0.24.ebuild | 157 --------------------- |
18 |
6 files changed, 264 deletions(-) |
19 |
|
20 |
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest |
21 |
index 8a6cfa6..fcb60cb 100644 |
22 |
--- a/app-emulation/lxd/Manifest |
23 |
+++ b/app-emulation/lxd/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
-DIST lxd-0.24.tar.bz2 1973022 SHA256 e3851bded0f2639e4aec9c63797135bfa3b27def17123c8e506c784b1ab4c99a SHA512 e7593136fd1fb13542a8415d964ff3bab8bcc7f7a7d806874e7c21fd9d96652aa5716a9d3318cea3d849a19aa96b40bfea27f4edd528c8307efaeeac88971f2e WHIRLPOOL 69b6722a25c9e75e533436a37951dc893cbf3d3c0f5d31b3ccc2cf0a7dede9cf16c53e68562348ab9bf9e621421030b826df21e5fb32df8a496127601fa5d898 |
26 |
DIST lxd-0.25.tar.bz2 1983043 SHA256 1cfdf1a5e8638060e2368e9e5cf8763406857309f08c4668fa0756e85ba7b89e SHA512 001e52826a3bbe00121115ddace14b3f552321f16e97700763ff6dd23b5babd3c1393cbc9b9b263b6a18c31e49c30d612e3d7153d4987644689989be0be50d00 WHIRLPOOL 496f3f19c50c1ee79ba8b5625cf34b6f57683f4066a09b3edc2cbd017cc5ebc2cc7ac9e569c94bcba0d699c6efb722b79ae43541e0dfddc2fb8d877131519b06 |
27 |
DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e |
28 |
DIST lxd-0.27.tar.bz2 2247266 SHA256 290d05a792f2f146b302d500eadd3168822ed99aecb4ea96762570580f29910a SHA512 37d5fef677a943dc7e84c73836aa1d4e5f0353c165aa33cefcd87dcd1fdae574760e74fb290404182badfee96e04ef929a81d6633d2c0f91c458ccd19996b9c3 WHIRLPOOL d1d0c0fad0e604f41482c133f4425461546599aded2e948d5c58f7698eba963746ac8c3c3085ffbd244b0169cedb26ad8ec5d85babea6aa9a7688ee6ce342589 |
29 |
|
30 |
diff --git a/app-emulation/lxd/files/lxd-0.24-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.24-dont-go-get.patch |
31 |
deleted file mode 100644 |
32 |
index 1b229ea..0000000 |
33 |
--- a/app-emulation/lxd/files/lxd-0.24-dont-go-get.patch |
34 |
+++ /dev/null |
35 |
@@ -1,18 +0,0 @@ |
36 |
---- Makefile.orig 2015-09-17 20:37:16.481867339 -0500 |
37 |
-+++ Makefile 2015-09-17 20:53:27.715800926 -0500 |
38 |
-@@ -12,15 +12,11 @@ |
39 |
- |
40 |
- .PHONY: default |
41 |
- default: |
42 |
-- -go get -t -v -d ./... |
43 |
-- -go get -t -v -d ./... |
44 |
- go install -v ./... |
45 |
- @echo "LXD built succesfuly" |
46 |
- |
47 |
- .PHONY: client |
48 |
- client: |
49 |
-- -go get -t -v -d ./... |
50 |
-- -go get -t -v -d ./... |
51 |
- go install -v ./lxc |
52 |
- @echo "LXD client built succesfuly" |
53 |
- |
54 |
|
55 |
diff --git a/app-emulation/lxd/files/lxd-0.24-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.24-nc-binary-name.patch |
56 |
deleted file mode 100644 |
57 |
index 7373b66..0000000 |
58 |
--- a/app-emulation/lxd/files/lxd-0.24-nc-binary-name.patch |
59 |
+++ /dev/null |
60 |
@@ -1,11 +0,0 @@ |
61 |
---- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600 |
62 |
-+++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600 |
63 |
-@@ -91,7 +91,7 @@ |
64 |
- * command (i.e. the command to run on --server). However, we're |
65 |
- * hardcoding that at the other end, so we can just ignore it. |
66 |
- */ |
67 |
-- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name()) |
68 |
-+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name()) |
69 |
- cmd := exec.Command( |
70 |
- "rsync", |
71 |
- "-arvP", |
72 |
|
73 |
diff --git a/app-emulation/lxd/files/lxd-0.24.confd b/app-emulation/lxd/files/lxd-0.24.confd |
74 |
deleted file mode 100644 |
75 |
index 3d55327..0000000 |
76 |
--- a/app-emulation/lxd/files/lxd-0.24.confd |
77 |
+++ /dev/null |
78 |
@@ -1,27 +0,0 @@ |
79 |
-# Group which owns the shared socket |
80 |
-LXD_OPTIONS+=" --group lxd" |
81 |
- |
82 |
- |
83 |
- |
84 |
-# Enable cpu profiling into the specified file |
85 |
-#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile" |
86 |
- |
87 |
-# Enable memory profiling into the specified file |
88 |
-#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile" |
89 |
- |
90 |
- |
91 |
- |
92 |
-# Enables debug mode |
93 |
-#LXD_OPTIONS+=" --debug" |
94 |
- |
95 |
-# For debugging, print a complete stack trace every n seconds |
96 |
-#LXD_OPTIONS+=" --print-goroutines-every 5" |
97 |
- |
98 |
-# Enables verbose mode |
99 |
-#LXD_OPTIONS+=" -v" |
100 |
- |
101 |
-# Logfile to log to |
102 |
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log" |
103 |
- |
104 |
-# Enables syslog logging |
105 |
-#LXD_OPTIONS+=" --syslog" |
106 |
|
107 |
diff --git a/app-emulation/lxd/files/lxd-0.24.initd b/app-emulation/lxd/files/lxd-0.24.initd |
108 |
deleted file mode 100644 |
109 |
index ec23258..0000000 |
110 |
--- a/app-emulation/lxd/files/lxd-0.24.initd |
111 |
+++ /dev/null |
112 |
@@ -1,50 +0,0 @@ |
113 |
-#!/sbin/runscript |
114 |
-# Copyright 1999-2015 Gentoo Foundation |
115 |
-# Distributed under the terms of the GNU General Public License v2 |
116 |
-# $Id$ |
117 |
- |
118 |
-DAEMON=/usr/sbin/lxd |
119 |
-PIDFILE=/run/lxd.pid |
120 |
- |
121 |
-extra_commands="stopall" |
122 |
- |
123 |
-depend() { |
124 |
- need net |
125 |
- use lxcfs |
126 |
- |
127 |
- # remove with 2.0 release |
128 |
- need cgmanager |
129 |
-} |
130 |
- |
131 |
-start() { |
132 |
- ebegin "Starting lxd server" |
133 |
- |
134 |
- start-stop-daemon --start \ |
135 |
- --pidfile ${PIDFILE} \ |
136 |
- --exec ${DAEMON} \ |
137 |
- --background \ |
138 |
- --make-pidfile \ |
139 |
- -- \ |
140 |
- ${LXD_OPTIONS} |
141 |
- |
142 |
- eend $? |
143 |
-} |
144 |
- |
145 |
-stop() { |
146 |
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then |
147 |
- stopall |
148 |
- else |
149 |
- ebegin "Stopping lxd service (but not containers)" |
150 |
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE} |
151 |
- eend $? |
152 |
- fi |
153 |
-} |
154 |
- |
155 |
-stopall() { |
156 |
- ebegin "Stopping lxd service and containers" |
157 |
- if "${DAEMON}" shutdown; then |
158 |
- /etc/init.d/lxd zap |
159 |
- rm -f ${PIDFILE} |
160 |
- fi |
161 |
- eend $? |
162 |
-} |
163 |
|
164 |
diff --git a/app-emulation/lxd/lxd-0.24.ebuild b/app-emulation/lxd/lxd-0.24.ebuild |
165 |
deleted file mode 100644 |
166 |
index 549dff5..0000000 |
167 |
--- a/app-emulation/lxd/lxd-0.24.ebuild |
168 |
+++ /dev/null |
169 |
@@ -1,157 +0,0 @@ |
170 |
-# Copyright 1999-2015 Gentoo Foundation |
171 |
-# Distributed under the terms of the GNU General Public License v2 |
172 |
-# $Id$ |
173 |
- |
174 |
-EAPI=5 |
175 |
- |
176 |
-DESCRIPTION="Fast, dense and secure container management" |
177 |
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" |
178 |
-EGO_PN_PARENT="github.com/lxc" |
179 |
-EGO_PN="${EGO_PN_PARENT}/lxd" |
180 |
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2" |
181 |
-LICENSE="Apache-2.0" |
182 |
-SLOT="0" |
183 |
-KEYWORDS="~amd64" |
184 |
- |
185 |
-PLOCALES="de fr ja" |
186 |
-IUSE="+daemon nls test" |
187 |
- |
188 |
-# IUSE and PLOCALES must be defined before l10n inherited |
189 |
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot |
190 |
- |
191 |
-# The compiler is forced in golang-base: |
192 |
-# DEPEND=">=dev-lang/go-1.4.2:=" |
193 |
-# ... so the dep is omitted here (and I disagree with := in this case) |
194 |
- |
195 |
-DEPEND=" |
196 |
- dev-go/go-crypto |
197 |
- dev-libs/protobuf |
198 |
- dev-vcs/git |
199 |
- nls? ( sys-devel/gettext ) |
200 |
- test? ( |
201 |
- app-misc/jq |
202 |
- dev-db/sqlite |
203 |
- net-misc/curl |
204 |
- sys-devel/gettext |
205 |
- ) |
206 |
-" |
207 |
- |
208 |
-RDEPEND=" |
209 |
- daemon? ( |
210 |
- app-admin/cgmanager |
211 |
- app-arch/xz-utils |
212 |
- app-emulation/lxc[cgmanager,seccomp] |
213 |
- net-analyzer/openbsd-netcat |
214 |
- net-misc/bridge-utils |
215 |
- net-misc/rsync[xattr] |
216 |
- sys-apps/iproute2 |
217 |
- virtual/acl |
218 |
- ) |
219 |
-" |
220 |
- |
221 |
-# KNOWN ISSUES: |
222 |
-# - Translations may not work. I've been unsuccessful in forcing |
223 |
-# localized output. Anyway, upstream (Canonical) doesn't install the |
224 |
-# message files. |
225 |
- |
226 |
-# TODO: |
227 |
-# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would |
228 |
-# be preferable for that support to go into the golang-build eclass not |
229 |
-# this package directly. |
230 |
- |
231 |
-src_prepare() { |
232 |
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir" |
233 |
- |
234 |
- epatch "${FILESDIR}/${P}-dont-go-get.patch" |
235 |
- |
236 |
- # Upstream requires the openbsd flavor of netcat (with -U), but |
237 |
- # Gentoo installs that with a renamed binary |
238 |
- epatch "${FILESDIR}/${P}-nc-binary-name.patch" |
239 |
- |
240 |
- # Warn on unhandled locale changes |
241 |
- l10n_find_plocales_changes po "" .po |
242 |
-} |
243 |
- |
244 |
-src_compile() { |
245 |
- golang-build_src_compile |
246 |
- |
247 |
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir" |
248 |
- |
249 |
- if use daemon; then |
250 |
- # Build binaries |
251 |
- GOPATH="${S}:$(get_golibdir_gopath)" emake |
252 |
- else |
253 |
- # build client tool |
254 |
- GOPATH="${S}:$(get_golibdir_gopath)" emake client |
255 |
- fi |
256 |
- |
257 |
- use nls && emake build-mo |
258 |
-} |
259 |
- |
260 |
-src_test() { |
261 |
- if use daemon; then |
262 |
- # Go native tests should succeed |
263 |
- golang-build_src_test |
264 |
- fi |
265 |
-} |
266 |
- |
267 |
-src_install() { |
268 |
- # Installs all src,pkg to /usr/lib/go-gentoo |
269 |
- golang-build_src_install |
270 |
- |
271 |
- cd "${S}" |
272 |
- dobin bin/lxc |
273 |
- use daemon && dosbin bin/lxd |
274 |
- |
275 |
- cd "src/${EGO_PN}" |
276 |
- |
277 |
- if use nls; then |
278 |
- for lingua in ${PLOCALES}; do |
279 |
- if use linguas_${lingua}; then |
280 |
- domo po/${lingua}.mo |
281 |
- fi |
282 |
- done |
283 |
- fi |
284 |
- |
285 |
- if use daemon; then |
286 |
- newinitd "${FILESDIR}"/${P}.initd lxd |
287 |
- newconfd "${FILESDIR}"/${P}.confd lxd |
288 |
- |
289 |
- systemd_dounit "${FILESDIR}"/lxd.service |
290 |
- fi |
291 |
- |
292 |
- newbashcomp config/bash/lxc.in lxc |
293 |
- |
294 |
- dodoc AUTHORS CONTRIBUTING.md README.md |
295 |
- |
296 |
- docinto specs |
297 |
- dodoc specs/* |
298 |
-} |
299 |
- |
300 |
-pkg_postinst() { |
301 |
- einfo |
302 |
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information," |
303 |
- einfo "including a Quick Start." |
304 |
- |
305 |
- # The messaging below only applies to daemon installs |
306 |
- use daemon || return 0 |
307 |
- |
308 |
- # The control socket will be owned by (and writeable by) this group. |
309 |
- enewgroup lxd |
310 |
- |
311 |
- # Ubuntu also defines an lxd user but it appears unused (the daemon |
312 |
- # must run as root) |
313 |
- |
314 |
- einfo |
315 |
- einfo "Though not strictly required, some features are enabled at run-time" |
316 |
- einfo "when the relevant helper programs are detected:" |
317 |
- einfo "- sys-apps/apparmor" |
318 |
- einfo "- sys-fs/btrfs-progs" |
319 |
- einfo "- sys-fs/lvm2" |
320 |
- einfo "- sys-fs/lxcfs" |
321 |
- einfo "- sys-fs/zfs" |
322 |
- einfo "- sys-process/criu" |
323 |
- einfo |
324 |
- einfo "Since these features can't be disabled at build-time they are" |
325 |
- einfo "not USE-conditional." |
326 |
-} |