1 |
commit: 2e422564a20244f01f7ae40c7a7d28f43216cd31 |
2 |
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 13 22:36:11 2018 +0000 |
4 |
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 13 22:37:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e422564 |
7 |
|
8 |
sys-fs/lxcfs: Bump to 3.0.2 |
9 |
|
10 |
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
sys-fs/lxcfs/Manifest | 1 + |
14 |
.../lxcfs/files/lxcfs-3.0.2-fusermount-path.patch | 15 +++++ |
15 |
sys-fs/lxcfs/files/lxcfs-3.0.2.initd | 26 ++++++++ |
16 |
sys-fs/lxcfs/lxcfs-3.0.2.ebuild | 72 ++++++++++++++++++++++ |
17 |
4 files changed, 114 insertions(+) |
18 |
|
19 |
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest |
20 |
index 7536f41bd56..cc84b00c2c3 100644 |
21 |
--- a/sys-fs/lxcfs/Manifest |
22 |
+++ b/sys-fs/lxcfs/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST lxcfs-2.0.4.tar.gz 52639 BLAKE2B 4ef8509b05ac98338003801afeb67a15fcfd1270f90e7b5d1970c4171b9296b77e116f91ec29ec29f3feb0e03c5f2ddf49d014824869aa6cf9897441ebac17a3 SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90 |
25 |
DIST lxcfs-2.0.6.tar.gz 62632 BLAKE2B 2bc76de0a7e2657b0d73e79260bfaf5a1ba070a4571d81a7c26d3637fc93937c824496119ff32fbfa56b6f97deca4bb145a952862aff148932531c489eea57a9 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d |
26 |
DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f |
27 |
+DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218 |
28 |
|
29 |
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..99a5addf1d1 |
32 |
--- /dev/null |
33 |
+++ b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch |
34 |
@@ -0,0 +1,15 @@ |
35 |
+--- /config/init/systemd/lxcfs.service.orig 2018-10-13 17:24:46.534035126 -0500 |
36 |
++++ /config/init/systemd/lxcfs.service 2018-10-13 17:25:33.007034294 -0500 |
37 |
+@@ -5,10 +5,10 @@ |
38 |
+ Documentation=man:lxcfs(1) |
39 |
+ |
40 |
+ [Service] |
41 |
+-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/ |
42 |
++ExecStart=/usr/bin/lxcfs -o allow_other,nonempty /var/lib/lxcfs/ |
43 |
+ KillMode=process |
44 |
+ Restart=on-failure |
45 |
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs |
46 |
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs |
47 |
+ Delegate=yes |
48 |
+ |
49 |
+ [Install] |
50 |
|
51 |
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2.initd b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd |
52 |
new file mode 100644 |
53 |
index 00000000000..52d8202d7ac |
54 |
--- /dev/null |
55 |
+++ b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd |
56 |
@@ -0,0 +1,26 @@ |
57 |
+#!/sbin/openrc-run |
58 |
+# Copyright 1999-2018 Gentoo Authors |
59 |
+# Distributed under the terms of the GNU General Public License v2 |
60 |
+ |
61 |
+DAEMON=/usr/bin/lxcfs |
62 |
+PIDFILE=/run/lxcfs.pid |
63 |
+ |
64 |
+start() { |
65 |
+ ebegin "Starting lxcfs" |
66 |
+ |
67 |
+ start-stop-daemon --start \ |
68 |
+ --pidfile ${PIDFILE} \ |
69 |
+ --exec ${DAEMON} \ |
70 |
+ --background \ |
71 |
+ --make-pidfile \ |
72 |
+ -- \ |
73 |
+ -o allow_other,nonempty /var/lib/lxcfs |
74 |
+ |
75 |
+ eend $? |
76 |
+} |
77 |
+ |
78 |
+stop() { |
79 |
+ ebegin "Stopping lxcfs" |
80 |
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE} |
81 |
+ eend $? |
82 |
+} |
83 |
|
84 |
diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild |
85 |
new file mode 100644 |
86 |
index 00000000000..ce923205a59 |
87 |
--- /dev/null |
88 |
+++ b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild |
89 |
@@ -0,0 +1,72 @@ |
90 |
+# Copyright 1999-2018 Gentoo Authors |
91 |
+# Distributed under the terms of the GNU General Public License v2 |
92 |
+ |
93 |
+EAPI=6 |
94 |
+ |
95 |
+inherit systemd vcs-snapshot |
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 |
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz" |
109 |
+ KEYWORDS="~amd64" |
110 |
+fi |
111 |
+ |
112 |
+# Omit all dbus. Upstream appears to require it because systemd, but |
113 |
+# lxcfs makes no direct use of dbus. |
114 |
+RDEPEND=" |
115 |
+ dev-libs/glib:2 |
116 |
+ sys-fs/fuse:0 |
117 |
+" |
118 |
+DEPEND=" |
119 |
+ sys-apps/help2man |
120 |
+ ${RDEPEND} |
121 |
+" |
122 |
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch" |
123 |
+ |
124 |
+src_prepare() { |
125 |
+ default |
126 |
+ ./bootstrap.sh || die "Failed to bootstrap configure files" |
127 |
+} |
128 |
+ |
129 |
+src_configure() { |
130 |
+ # Without the localstatedir the filesystem isn't mounted correctly |
131 |
+ econf --localstatedir=/var |
132 |
+} |
133 |
+ |
134 |
+# Test suite fails for me |
135 |
+# src_test() { |
136 |
+# emake tests |
137 |
+# tests/main.sh || die "Tests failed" |
138 |
+# } |
139 |
+ |
140 |
+src_install() { |
141 |
+ default |
142 |
+ keepdir /var/lib/lxcfs |
143 |
+ newinitd "${FILESDIR}"/${P}.initd lxcfs |
144 |
+ systemd_dounit config/init/systemd/lxcfs.service |
145 |
+} |
146 |
+ |
147 |
+pkg_preinst() { |
148 |
+ # In an upgrade situation merging /var/lib/lxcfs (an empty dir) |
149 |
+ # fails because that is a live mountpoint when the service is |
150 |
+ # running. It's unnecessary anyway so skip the action. |
151 |
+ [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var |
152 |
+} |
153 |
+ |
154 |
+pkg_postinst() { |
155 |
+ einfo |
156 |
+ einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and" |
157 |
+ einfo "will eventually be available in app-emulation/lxc. See:" |
158 |
+ einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html" |
159 |
+ einfo "for more information." |
160 |
+ einfo |
161 |
+} |