1 |
commit: 233276e2457c31e779bf491af2b5462c247831cf |
2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 26 07:52:10 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 26 08:13:01 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233276e2 |
7 |
|
8 |
sys-fs/lxcfs: remove old 3.0.3 |
9 |
|
10 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
11 |
|
12 |
sys-fs/lxcfs/Manifest | 1 - |
13 |
sys-fs/lxcfs/files/lxcfs-fusermount-path.patch | 15 ------ |
14 |
sys-fs/lxcfs/files/lxcfs.initd | 26 ---------- |
15 |
sys-fs/lxcfs/lxcfs-3.0.3.ebuild | 72 -------------------------- |
16 |
4 files changed, 114 deletions(-) |
17 |
|
18 |
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest |
19 |
index e9d5038efe9..1eb6648b2c6 100644 |
20 |
--- a/sys-fs/lxcfs/Manifest |
21 |
+++ b/sys-fs/lxcfs/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6 |
24 |
DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b |
25 |
DIST lxcfs-4.0.4.tar.gz 101546 BLAKE2B 1e84e3b75bfb39273539ea72f941442cc3c8574c0f55359a38edc04a98a45ea8680f9bf49c5974decf180a8ecf07cadccf4e732d1743c070a740c78b773a3ee8 SHA512 15bcebecc815310870aea58d995d605444b57583b7f1bb2d35b065256ea5f70b071d58887fbf1ca124ea84da99151bbd9dffcca37a2e151677d56229dc8961ce |
26 |
|
27 |
diff --git a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch |
28 |
deleted file mode 100644 |
29 |
index 99a5addf1d1..00000000000 |
30 |
--- a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch |
31 |
+++ /dev/null |
32 |
@@ -1,15 +0,0 @@ |
33 |
---- /config/init/systemd/lxcfs.service.orig 2018-10-13 17:24:46.534035126 -0500 |
34 |
-+++ /config/init/systemd/lxcfs.service 2018-10-13 17:25:33.007034294 -0500 |
35 |
-@@ -5,10 +5,10 @@ |
36 |
- Documentation=man:lxcfs(1) |
37 |
- |
38 |
- [Service] |
39 |
--ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/ |
40 |
-+ExecStart=/usr/bin/lxcfs -o allow_other,nonempty /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.initd b/sys-fs/lxcfs/files/lxcfs.initd |
50 |
deleted file mode 100644 |
51 |
index 5997426fa8e..00000000000 |
52 |
--- a/sys-fs/lxcfs/files/lxcfs.initd |
53 |
+++ /dev/null |
54 |
@@ -1,26 +0,0 @@ |
55 |
-#!/sbin/openrc-run |
56 |
-# Copyright 1999-2019 Gentoo Authors |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
- |
59 |
-DAEMON=/usr/bin/lxcfs |
60 |
-PIDFILE=/run/lxcfs.pid |
61 |
- |
62 |
-start() { |
63 |
- ebegin "Starting lxcfs" |
64 |
- |
65 |
- start-stop-daemon --start \ |
66 |
- --pidfile ${PIDFILE} \ |
67 |
- --exec ${DAEMON} \ |
68 |
- --background \ |
69 |
- --make-pidfile \ |
70 |
- -- \ |
71 |
- -o allow_other,nonempty /var/lib/lxcfs |
72 |
- |
73 |
- eend $? |
74 |
-} |
75 |
- |
76 |
-stop() { |
77 |
- ebegin "Stopping lxcfs" |
78 |
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE} |
79 |
- eend $? |
80 |
-} |
81 |
|
82 |
diff --git a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild |
83 |
deleted file mode 100644 |
84 |
index f9c354a881a..00000000000 |
85 |
--- a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild |
86 |
+++ /dev/null |
87 |
@@ -1,72 +0,0 @@ |
88 |
-# Copyright 1999-2019 Gentoo Authors |
89 |
-# Distributed under the terms of the GNU General Public License v2 |
90 |
- |
91 |
-EAPI=6 |
92 |
- |
93 |
-inherit systemd vcs-snapshot |
94 |
-DESCRIPTION="FUSE filesystem for LXC" |
95 |
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/" |
96 |
-LICENSE="Apache-2.0" |
97 |
-SLOT="0" |
98 |
- |
99 |
-if [[ ${PV} == "9999" ]] ; then |
100 |
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git" |
101 |
- EGIT_BRANCH="master" |
102 |
- inherit git-r3 |
103 |
- SRC_URI="" |
104 |
- KEYWORDS="" |
105 |
-else |
106 |
- SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz" |
107 |
- KEYWORDS="amd64" |
108 |
-fi |
109 |
- |
110 |
-# Omit all dbus. Upstream appears to require it because systemd, but |
111 |
-# lxcfs makes no direct use of dbus. |
112 |
-RDEPEND=" |
113 |
- dev-libs/glib:2 |
114 |
- sys-fs/fuse:0 |
115 |
-" |
116 |
-DEPEND=" |
117 |
- sys-apps/help2man |
118 |
- ${RDEPEND} |
119 |
-" |
120 |
-PATCHES="${FILESDIR}/${PN}-fusermount-path.patch" |
121 |
- |
122 |
-src_prepare() { |
123 |
- default |
124 |
- ./bootstrap.sh || die "Failed to bootstrap configure files" |
125 |
-} |
126 |
- |
127 |
-src_configure() { |
128 |
- # Without the localstatedir the filesystem isn't mounted correctly |
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 |
- keepdir /var/lib/lxcfs |
141 |
- newinitd "${FILESDIR}"/${PN}.initd lxcfs |
142 |
- systemd_dounit config/init/systemd/lxcfs.service |
143 |
-} |
144 |
- |
145 |
-pkg_preinst() { |
146 |
- # In an upgrade situation merging /var/lib/lxcfs (an empty dir) |
147 |
- # fails because that is a live mountpoint when the service is |
148 |
- # running. It's unnecessary anyway so skip the action. |
149 |
- [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var |
150 |
-} |
151 |
- |
152 |
-pkg_postinst() { |
153 |
- einfo |
154 |
- einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and" |
155 |
- einfo "will eventually be available in app-emulation/lxc. See:" |
156 |
- einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html" |
157 |
- einfo "for more information." |
158 |
- einfo |
159 |
-} |