Gentoo Archives: gentoo-commits

From: Erik Mackdanz <stasibear@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
Date: Sat, 02 Apr 2016 16:06:14
Message-Id: 1459613247.99283bb8c1c8e7ffcf174f2334894eb3953be36c.stasibear@gentoo
1 commit: 99283bb8c1c8e7ffcf174f2334894eb3953be36c
2 Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 2 16:07:27 2016 +0000
4 Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 2 16:07:27 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99283bb8
7
8 sys-fs/lxcfs: remove old
9
10 Package-Manager: portage-2.2.28
11
12 sys-fs/lxcfs/Manifest | 1 -
13 sys-fs/lxcfs/files/lxcfs-0.16.initd | 27 -----------------
14 sys-fs/lxcfs/files/lxcfs-0.16.service | 13 --------
15 sys-fs/lxcfs/lxcfs-0.16.ebuild | 56 -----------------------------------
16 4 files changed, 97 deletions(-)
17
18 diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
19 index 556cdef..f23f15e 100644
20 --- a/sys-fs/lxcfs/Manifest
21 +++ b/sys-fs/lxcfs/Manifest
22 @@ -1,4 +1,3 @@
23 -DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
24 DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
25 DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf759d61900cb93f4d12c517d SHA512 44b35b6c275366f88e036ed1e136cb193b65024fcbdff250658d360fced14bec84a2bcfa9f8ca28af9205f38babdd5520cfa42a5521cf545c42df80eec40c1b8 WHIRLPOOL 8972fe4838a3ec157479a9bed9404ba51d7ea47efe7e37c2b9f872fcab6068daef6898ef143304868003748a50068cc5634041020d6b6ced0acca97ffd9d8d07
26 DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
27
28 diff --git a/sys-fs/lxcfs/files/lxcfs-0.16.initd b/sys-fs/lxcfs/files/lxcfs-0.16.initd
29 deleted file mode 100755
30 index a850214..0000000
31 --- a/sys-fs/lxcfs/files/lxcfs-0.16.initd
32 +++ /dev/null
33 @@ -1,27 +0,0 @@
34 -#!/sbin/runscript
35 -# Copyright 1999-2015 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -DAEMON=/usr/bin/lxcfs
40 -PIDFILE=/run/lxcfs.pid
41 -
42 -start() {
43 - ebegin "Starting lxcfs"
44 -
45 - start-stop-daemon --start \
46 - --pidfile ${PIDFILE} \
47 - --exec ${DAEMON} \
48 - --background \
49 - --make-pidfile \
50 - -- \
51 - -f -o allow_other /var/lib/lxcfs
52 -
53 - eend $?
54 -}
55 -
56 -stop() {
57 - ebegin "Stopping lxcfs"
58 - start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
59 - eend $?
60 -}
61
62 diff --git a/sys-fs/lxcfs/files/lxcfs-0.16.service b/sys-fs/lxcfs/files/lxcfs-0.16.service
63 deleted file mode 100644
64 index ff737c7..0000000
65 --- a/sys-fs/lxcfs/files/lxcfs-0.16.service
66 +++ /dev/null
67 @@ -1,13 +0,0 @@
68 -[Unit]
69 -Description=FUSE filesystem for LXC
70 -ConditionVirtualization=!container
71 -Before=lxc.service
72 -
73 -[Service]
74 -ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
75 -KillMode=none
76 -Restart=on-failure
77 -ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
78 -
79 -[Install]
80 -WantedBy=multi-user.target
81
82 diff --git a/sys-fs/lxcfs/lxcfs-0.16.ebuild b/sys-fs/lxcfs/lxcfs-0.16.ebuild
83 deleted file mode 100644
84 index d2b444d..0000000
85 --- a/sys-fs/lxcfs/lxcfs-0.16.ebuild
86 +++ /dev/null
87 @@ -1,56 +0,0 @@
88 -# Copyright 1999-2016 Gentoo Foundation
89 -# Distributed under the terms of the GNU General Public License v2
90 -# $Id$
91 -
92 -EAPI=5
93 -
94 -inherit eutils systemd vcs-snapshot
95 -DESCRIPTION="FUSE filesystem for LXC"
96 -HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
97 -LICENSE="Apache-2.0"
98 -SLOT="0"
99 -
100 -if [[ ${PV} == "9999" ]] ; then
101 - EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
102 - EGIT_BRANCH="master"
103 - inherit git-r3
104 - SRC_URI=""
105 - KEYWORDS=""
106 -else
107 - SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
108 - KEYWORDS="~amd64"
109 -fi
110 -
111 -#IUSE="test"
112 -
113 -# Omit all dbus. Upstream appears to require it because systemd, but
114 -# lxcfs makes no direct use of dbus.
115 -RDEPEND="
116 - dev-libs/glib:2
117 - sys-fs/fuse
118 -"
119 -DEPEND="
120 - sys-apps/help2man
121 - ${RDEPEND}
122 -"
123 -
124 -src_prepare() {
125 - ./bootstrap.sh || die "Failed to bootstrap configure files"
126 -}
127 -
128 -src_configure() {
129 - econf --localstatedir=/var
130 -}
131 -
132 -# Test suite fails for me
133 -# src_test() {
134 -# emake tests
135 -# tests/main.sh || die "Tests failed"
136 -# }
137 -
138 -src_install() {
139 - default
140 - dodir /var/lib/lxcfs
141 - newinitd "${FILESDIR}"/${P}.initd lxcfs
142 - systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
143 -}