1 |
commit: be683dcf660b9f522a6abc2c3366ca095046e630 |
2 |
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 3 20:29:05 2016 +0000 |
4 |
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 3 20:33:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be683dcf |
7 |
|
8 |
sys-fs/lxcfs: Bump to 2.0.3 |
9 |
|
10 |
EAPI=6 Also, fix a merge-time failure when /var/lib/lxcfs is installed |
11 |
to a live mountpoint. |
12 |
|
13 |
Package-Manager: portage-2.3.0 |
14 |
|
15 |
sys-fs/lxcfs/Manifest | 1 + |
16 |
.../lxcfs/files/lxcfs-2.0.3-fusermount-path.patch | 11 ++++ |
17 |
sys-fs/lxcfs/files/lxcfs-2.0.3.initd | 27 ++++++++ |
18 |
sys-fs/lxcfs/lxcfs-2.0.3.ebuild | 71 ++++++++++++++++++++++ |
19 |
4 files changed, 110 insertions(+) |
20 |
|
21 |
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest |
22 |
index 80dc109..b8b1bc2 100644 |
23 |
--- a/sys-fs/lxcfs/Manifest |
24 |
+++ b/sys-fs/lxcfs/Manifest |
25 |
@@ -3,3 +3,4 @@ DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf75 |
26 |
DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971 |
27 |
DIST lxcfs-2.0.1.tar.gz 49004 SHA256 4731a4d6939e32f3503560ee953e840d16e6abbb4fc7993c92cc1179e40d4f84 SHA512 3801a1d643b1f4478e702f615c8f9f9bc7070272ef2cca6c22d944a680f6829f0b14b7d193cc5c046f9f1a0a258bd5de68456d884a00d48f0f2639c66975cb23 WHIRLPOOL cbbad76d61a05dbb4750cd8218e1946d6b8b2e798f0a4071c6e706ee6d88a0e36dd9fcc8664c9cb0e3f8bdbac9ba6c548ce0a0829a4bf79d0965f18ee207bb90 |
28 |
DIST lxcfs-2.0.2.tar.gz 49185 SHA256 f3e9c7d53f25c2e71745dbef4c1b96d301fac12cb041329f3bbe438d7d7a4eda SHA512 358ea0d56d02a45cf93799663e067dc14fa6056f63b9047a7c7691ff0ff0ea44312be19baa0438887708de0fe85e10599e6c0178fbcbe483a6aaa56318c46fdd WHIRLPOOL 590ca502c2f72016b58d7fdb43db94ee1fa6f1af5fe9bd7d3b33d0f97fbff766b5adb22356d12f53601f070acb48d7645faa25128168094c8d42db9b39fa0263 |
29 |
+DIST lxcfs-2.0.3.tar.gz 51078 SHA256 742a6cc463dc66179c334ebca4c3276888ef27a564e5e47212b60c655a811a72 SHA512 14caa2d6598529610ef6bd4c1d6f4d4598e8dc1378a3ee35ea7a1582c11150c896facc80216e67526384995891d9cc1244796860b790ecfc8bf735cc2cd80923 WHIRLPOOL f2de2438e4e521db5135ca81daceccdc1d3820907de9d37842c9bafa112cc416774cb2efe27b815cecccc26e55617c7eb9f5d076df5423ab354747605fa90643 |
30 |
|
31 |
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch |
32 |
new file mode 100644 |
33 |
index 00000000..61d3494 |
34 |
--- /dev/null |
35 |
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch |
36 |
@@ -0,0 +1,11 @@ |
37 |
+--- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000 |
38 |
++++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000 |
39 |
+@@ -7,7 +7,7 @@ |
40 |
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/ |
41 |
+ KillMode=process |
42 |
+ Restart=on-failure |
43 |
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs |
44 |
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs |
45 |
+ Delegate=yes |
46 |
+ |
47 |
+ [Install] |
48 |
|
49 |
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.3.initd b/sys-fs/lxcfs/files/lxcfs-2.0.3.initd |
50 |
new file mode 100644 |
51 |
index 00000000..7436eee |
52 |
--- /dev/null |
53 |
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.3.initd |
54 |
@@ -0,0 +1,27 @@ |
55 |
+#!/sbin/openrc-run |
56 |
+# Copyright 1999-2016 Gentoo Foundation |
57 |
+# Distributed under the terms of the GNU General Public License v2 |
58 |
+# $Id$ |
59 |
+ |
60 |
+DAEMON=/usr/bin/lxcfs |
61 |
+PIDFILE=/run/lxcfs.pid |
62 |
+ |
63 |
+start() { |
64 |
+ ebegin "Starting lxcfs" |
65 |
+ |
66 |
+ start-stop-daemon --start \ |
67 |
+ --pidfile ${PIDFILE} \ |
68 |
+ --exec ${DAEMON} \ |
69 |
+ --background \ |
70 |
+ --make-pidfile \ |
71 |
+ -- \ |
72 |
+ -f -o allow_other /var/lib/lxcfs |
73 |
+ |
74 |
+ eend $? |
75 |
+} |
76 |
+ |
77 |
+stop() { |
78 |
+ ebegin "Stopping lxcfs" |
79 |
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE} |
80 |
+ eend $? |
81 |
+} |
82 |
|
83 |
diff --git a/sys-fs/lxcfs/lxcfs-2.0.3.ebuild b/sys-fs/lxcfs/lxcfs-2.0.3.ebuild |
84 |
new file mode 100644 |
85 |
index 00000000..39c20c4 |
86 |
--- /dev/null |
87 |
+++ b/sys-fs/lxcfs/lxcfs-2.0.3.ebuild |
88 |
@@ -0,0 +1,71 @@ |
89 |
+# Copyright 1999-2016 Gentoo Foundation |
90 |
+# Distributed under the terms of the GNU General Public License v2 |
91 |
+# $Id$ |
92 |
+ |
93 |
+EAPI=6 |
94 |
+ |
95 |
+inherit systemd vcs-snapshot versionator |
96 |
+DESCRIPTION="FUSE filesystem for LXC" |
97 |
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/" |
98 |
+LICENSE="Apache-2.0" |
99 |
+SLOT="0" |
100 |
+ |
101 |
+if [[ ${PV} == "9999" ]] ; then |
102 |
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git" |
103 |
+ EGIT_BRANCH="master" |
104 |
+ inherit git-r3 |
105 |
+ SRC_URI="" |
106 |
+ KEYWORDS="" |
107 |
+else |
108 |
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2 |
109 |
+ UPSTREAM_PV=$(replace_version_separator 3 '.' ) |
110 |
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz" |
111 |
+ KEYWORDS="~amd64" |
112 |
+fi |
113 |
+ |
114 |
+IUSE="pam" |
115 |
+ |
116 |
+# Omit all dbus. Upstream appears to require it because systemd, but |
117 |
+# lxcfs makes no direct use of dbus. |
118 |
+RDEPEND=" |
119 |
+ dev-libs/glib:2 |
120 |
+ sys-fs/fuse |
121 |
+ virtual/pam |
122 |
+" |
123 |
+DEPEND=" |
124 |
+ sys-apps/help2man |
125 |
+ ${RDEPEND} |
126 |
+" |
127 |
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch" |
128 |
+ |
129 |
+src_prepare() { |
130 |
+ default |
131 |
+ ./bootstrap.sh || die "Failed to bootstrap configure files" |
132 |
+} |
133 |
+ |
134 |
+src_configure() { |
135 |
+ use pam || pamflag="--with-pamdir=none" |
136 |
+ |
137 |
+ # Without the localstatedir the filesystem isn't mounted correctly |
138 |
+ econf --localstatedir=/var ${pamflag} |
139 |
+} |
140 |
+ |
141 |
+# Test suite fails for me |
142 |
+# src_test() { |
143 |
+# emake tests |
144 |
+# tests/main.sh || die "Tests failed" |
145 |
+# } |
146 |
+ |
147 |
+src_install() { |
148 |
+ default |
149 |
+ dodir /var/lib/lxcfs |
150 |
+ newinitd "${FILESDIR}"/${P}.initd lxcfs |
151 |
+ systemd_dounit config/init/systemd/lxcfs.service |
152 |
+} |
153 |
+ |
154 |
+pkg_preinst() { |
155 |
+ # In an upgrade situation merging /var/lib/lxcfs (an empty dir) |
156 |
+ # fails because that is a live mountpoint when the service is |
157 |
+ # running. It's unnecessary anyway so skip the action. |
158 |
+ [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var |
159 |
+} |