* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2015-11-21 18:30 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2015-11-21 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 182814dcb1d2f6e745a6d9715e5f957f8cbe5186
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 18:30:37 2015 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 18:30:37 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182814dc
sys-fs/lxcfs: New package 0.12
Package-Manager: portage-2.2.24
sys-fs/lxcfs/Manifest | 1 +
sys-fs/lxcfs/files/lxcfs-0.12.initd | 27 +++++++++++++++++
sys-fs/lxcfs/files/lxcfs-0.12.service | 13 ++++++++
sys-fs/lxcfs/lxcfs-0.12.ebuild | 56 +++++++++++++++++++++++++++++++++++
sys-fs/lxcfs/metadata.xml | 21 +++++++++++++
5 files changed, 118 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
new file mode 100644
index 0000000..5613217
--- /dev/null
+++ b/sys-fs/lxcfs/Manifest
@@ -0,0 +1 @@
+DIST lxcfs-0.12.tar.gz 34700 SHA256 89fc1caf3787b99dc26dc4b6b35fe216aad09b35c46e4be1d75c0e136f53702c SHA512 0145fe6252990bc14e6db32ab05337df9899c0e4d02ced35a5693da49aa84b4932f3c3bf58422a6d3c12c35a5db73169c4ab79448c928caae61996b0c92b908e WHIRLPOOL 940c9c2dd32547cb1a2a98423e03b3a9b7e8bae00775b45a8bdd7a99ee05ffa9bdf24e863ca65944abef2526d11b6b5532299aabc4ae50c97f42b3c2187ada5b
diff --git a/sys-fs/lxcfs/files/lxcfs-0.12.initd b/sys-fs/lxcfs/files/lxcfs-0.12.initd
new file mode 100755
index 0000000..a850214
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-0.12.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/files/lxcfs-0.12.service b/sys-fs/lxcfs/files/lxcfs-0.12.service
new file mode 100644
index 0000000..ff737c7
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-0.12.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+
+[Service]
+ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
+KillMode=none
+Restart=on-failure
+ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-0.12.ebuild b/sys-fs/lxcfs/lxcfs-0.12.ebuild
new file mode 100644
index 0000000..24afca0
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-0.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+#IUSE="test"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+
+src_prepare() {
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
+}
diff --git a/sys-fs/lxcfs/metadata.xml b/sys-fs/lxcfs/metadata.xml
new file mode 100644
index 0000000..93caf7b
--- /dev/null
+++ b/sys-fs/lxcfs/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer status="active">
+ <email>stasibear@gentoo.org</email>
+ <name>Erik Mackdanz</name>
+ </maintainer>
+ <maintainer>
+ <email>john@irc.tm</email>
+ <name>John Cooke</name>
+ </maintainer>
+ <longdescription>
+ LXCFS is a simple userspace filesystem designed to
+ provide a cgroupfs-like tree which is container aware
+ and a set of files which can be bind-mounted over
+ their /proc originals to provide cgroup-aware values.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">lxc/lxfs</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2015-12-12 2:33 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2015-12-12 2:33 UTC (permalink / raw
To: gentoo-commits
commit: 0b5e60c8e9da8aff35343cf7fbcd932933b22945
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 02:34:02 2015 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 02:34:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5e60c8
sys-fs/lxcfs: bump to 0.13
Package-Manager: portage-2.2.26
sys-fs/lxcfs/Manifest | 1 +
sys-fs/lxcfs/files/lxcfs-0.13.initd | 27 +++++++++++++++++
sys-fs/lxcfs/files/lxcfs-0.13.service | 13 ++++++++
sys-fs/lxcfs/lxcfs-0.13.ebuild | 56 +++++++++++++++++++++++++++++++++++
4 files changed, 97 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 5613217..c4d6c0d 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1 +1,2 @@
DIST lxcfs-0.12.tar.gz 34700 SHA256 89fc1caf3787b99dc26dc4b6b35fe216aad09b35c46e4be1d75c0e136f53702c SHA512 0145fe6252990bc14e6db32ab05337df9899c0e4d02ced35a5693da49aa84b4932f3c3bf58422a6d3c12c35a5db73169c4ab79448c928caae61996b0c92b908e WHIRLPOOL 940c9c2dd32547cb1a2a98423e03b3a9b7e8bae00775b45a8bdd7a99ee05ffa9bdf24e863ca65944abef2526d11b6b5532299aabc4ae50c97f42b3c2187ada5b
+DIST lxcfs-0.13.tar.gz 35046 SHA256 a0280b1080c95062d75fa0a3f0e743849c7cd8a88b49ff8323a665cbac75224a SHA512 bca32de4857dbcafeca0d206fd202223b35aa5918ffee9d88486cec0d7c686e9b258918204f340f666fb3ac5d382ee84706db4f5268e98c8153e4ccc5de12595 WHIRLPOOL d074d482461e8f98d55f9919eabd98cc6c015fce7f731bb99122c7b16bf40faa37a7c3ffbe2e7aa7375a0313c00e508d79863f1a60e53ab584696fe5abaec5dc
diff --git a/sys-fs/lxcfs/files/lxcfs-0.13.initd b/sys-fs/lxcfs/files/lxcfs-0.13.initd
new file mode 100755
index 0000000..a850214
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-0.13.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/files/lxcfs-0.13.service b/sys-fs/lxcfs/files/lxcfs-0.13.service
new file mode 100644
index 0000000..ff737c7
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-0.13.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+
+[Service]
+ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
+KillMode=none
+Restart=on-failure
+ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-0.13.ebuild b/sys-fs/lxcfs/lxcfs-0.13.ebuild
new file mode 100644
index 0000000..24afca0
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-0.13.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+#IUSE="test"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+
+src_prepare() {
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-01-09 3:26 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-01-09 3:26 UTC (permalink / raw
To: gentoo-commits
commit: de05ed5949dc4872b642407719d1336e6367d282
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 03:27:06 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 03:27:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de05ed59
sys-fs/lxcfs: bump to 0.16
Package-Manager: portage-2.2.26
sys-fs/lxcfs/Manifest | 1 +
sys-fs/lxcfs/files/lxcfs-0.16.initd | 27 +++++++++++++++++
sys-fs/lxcfs/files/lxcfs-0.16.service | 13 ++++++++
sys-fs/lxcfs/lxcfs-0.16.ebuild | 56 +++++++++++++++++++++++++++++++++++
4 files changed, 97 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index c4d6c0d..2352b2f 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,2 +1,3 @@
DIST lxcfs-0.12.tar.gz 34700 SHA256 89fc1caf3787b99dc26dc4b6b35fe216aad09b35c46e4be1d75c0e136f53702c SHA512 0145fe6252990bc14e6db32ab05337df9899c0e4d02ced35a5693da49aa84b4932f3c3bf58422a6d3c12c35a5db73169c4ab79448c928caae61996b0c92b908e WHIRLPOOL 940c9c2dd32547cb1a2a98423e03b3a9b7e8bae00775b45a8bdd7a99ee05ffa9bdf24e863ca65944abef2526d11b6b5532299aabc4ae50c97f42b3c2187ada5b
DIST lxcfs-0.13.tar.gz 35046 SHA256 a0280b1080c95062d75fa0a3f0e743849c7cd8a88b49ff8323a665cbac75224a SHA512 bca32de4857dbcafeca0d206fd202223b35aa5918ffee9d88486cec0d7c686e9b258918204f340f666fb3ac5d382ee84706db4f5268e98c8153e4ccc5de12595 WHIRLPOOL d074d482461e8f98d55f9919eabd98cc6c015fce7f731bb99122c7b16bf40faa37a7c3ffbe2e7aa7375a0313c00e508d79863f1a60e53ab584696fe5abaec5dc
+DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
diff --git a/sys-fs/lxcfs/files/lxcfs-0.16.initd b/sys-fs/lxcfs/files/lxcfs-0.16.initd
new file mode 100755
index 0000000..a850214
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-0.16.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/files/lxcfs-0.16.service b/sys-fs/lxcfs/files/lxcfs-0.16.service
new file mode 100644
index 0000000..ff737c7
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-0.16.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+
+[Service]
+ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
+KillMode=none
+Restart=on-failure
+ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-0.16.ebuild b/sys-fs/lxcfs/lxcfs-0.16.ebuild
new file mode 100644
index 0000000..d2b444d
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-0.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+#IUSE="test"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+
+src_prepare() {
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-01-28 16:49 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-01-28 16:49 UTC (permalink / raw
To: gentoo-commits
commit: df4932ee6d37ceb18153bc065d50e2b1f44ec7b4
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 16:49:50 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 16:49:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df4932ee
sys-fs/lxcfs: bump to 0.17
Adds a PAM module
Package-Manager: portage-2.2.27
sys-fs/lxcfs/Manifest | 1 +
sys-fs/lxcfs/files/lxcfs-0.17.initd | 27 +++++++++++++++++
sys-fs/lxcfs/files/lxcfs-0.17.service | 13 ++++++++
sys-fs/lxcfs/lxcfs-0.17.ebuild | 57 +++++++++++++++++++++++++++++++++++
4 files changed, 98 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 2352b2f..71c4754 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,4 @@
DIST lxcfs-0.12.tar.gz 34700 SHA256 89fc1caf3787b99dc26dc4b6b35fe216aad09b35c46e4be1d75c0e136f53702c SHA512 0145fe6252990bc14e6db32ab05337df9899c0e4d02ced35a5693da49aa84b4932f3c3bf58422a6d3c12c35a5db73169c4ab79448c928caae61996b0c92b908e WHIRLPOOL 940c9c2dd32547cb1a2a98423e03b3a9b7e8bae00775b45a8bdd7a99ee05ffa9bdf24e863ca65944abef2526d11b6b5532299aabc4ae50c97f42b3c2187ada5b
DIST lxcfs-0.13.tar.gz 35046 SHA256 a0280b1080c95062d75fa0a3f0e743849c7cd8a88b49ff8323a665cbac75224a SHA512 bca32de4857dbcafeca0d206fd202223b35aa5918ffee9d88486cec0d7c686e9b258918204f340f666fb3ac5d382ee84706db4f5268e98c8153e4ccc5de12595 WHIRLPOOL d074d482461e8f98d55f9919eabd98cc6c015fce7f731bb99122c7b16bf40faa37a7c3ffbe2e7aa7375a0313c00e508d79863f1a60e53ab584696fe5abaec5dc
DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
+DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
diff --git a/sys-fs/lxcfs/files/lxcfs-0.17.initd b/sys-fs/lxcfs/files/lxcfs-0.17.initd
new file mode 100755
index 0000000..a850214
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-0.17.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/files/lxcfs-0.17.service b/sys-fs/lxcfs/files/lxcfs-0.17.service
new file mode 100644
index 0000000..ff737c7
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-0.17.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+
+[Service]
+ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
+KillMode=none
+Restart=on-failure
+ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-0.17.ebuild b/sys-fs/lxcfs/lxcfs-0.17.ebuild
new file mode 100644
index 0000000..21f896c
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-0.17.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+#IUSE="test"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+ virtual/pam
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+
+src_prepare() {
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-01-28 16:51 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-01-28 16:51 UTC (permalink / raw
To: gentoo-commits
commit: dcb02e7b0405208eaa1655637deba2be830c3452
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 16:51:33 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 16:51:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb02e7b
sys-fs/lxcfs: Remove old
Package-Manager: portage-2.2.27
sys-fs/lxcfs/Manifest | 1 -
sys-fs/lxcfs/files/lxcfs-0.12.initd | 27 -----------------
sys-fs/lxcfs/files/lxcfs-0.12.service | 13 --------
sys-fs/lxcfs/lxcfs-0.12.ebuild | 56 -----------------------------------
4 files changed, 97 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 71c4754..6df659a 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,4 +1,3 @@
-DIST lxcfs-0.12.tar.gz 34700 SHA256 89fc1caf3787b99dc26dc4b6b35fe216aad09b35c46e4be1d75c0e136f53702c SHA512 0145fe6252990bc14e6db32ab05337df9899c0e4d02ced35a5693da49aa84b4932f3c3bf58422a6d3c12c35a5db73169c4ab79448c928caae61996b0c92b908e WHIRLPOOL 940c9c2dd32547cb1a2a98423e03b3a9b7e8bae00775b45a8bdd7a99ee05ffa9bdf24e863ca65944abef2526d11b6b5532299aabc4ae50c97f42b3c2187ada5b
DIST lxcfs-0.13.tar.gz 35046 SHA256 a0280b1080c95062d75fa0a3f0e743849c7cd8a88b49ff8323a665cbac75224a SHA512 bca32de4857dbcafeca0d206fd202223b35aa5918ffee9d88486cec0d7c686e9b258918204f340f666fb3ac5d382ee84706db4f5268e98c8153e4ccc5de12595 WHIRLPOOL d074d482461e8f98d55f9919eabd98cc6c015fce7f731bb99122c7b16bf40faa37a7c3ffbe2e7aa7375a0313c00e508d79863f1a60e53ab584696fe5abaec5dc
DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
diff --git a/sys-fs/lxcfs/files/lxcfs-0.12.initd b/sys-fs/lxcfs/files/lxcfs-0.12.initd
deleted file mode 100755
index a850214..0000000
--- a/sys-fs/lxcfs/files/lxcfs-0.12.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-0.12.service b/sys-fs/lxcfs/files/lxcfs-0.12.service
deleted file mode 100644
index ff737c7..0000000
--- a/sys-fs/lxcfs/files/lxcfs-0.12.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-
-[Service]
-ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
-KillMode=none
-Restart=on-failure
-ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-0.12.ebuild b/sys-fs/lxcfs/lxcfs-0.12.ebuild
deleted file mode 100644
index 24afca0..0000000
--- a/sys-fs/lxcfs/lxcfs-0.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-#IUSE="test"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-
-src_prepare() {
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-02-22 4:11 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-02-22 4:11 UTC (permalink / raw
To: gentoo-commits
commit: e8a2d184834becddfafa0c2b178a18db5a3814bd
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 04:11:46 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 04:11:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a2d184
sys-fs/lxcfs: bump to 2.0.0_beta2
Package-Manager: portage-2.2.27
sys-fs/lxcfs/Manifest | 1 +
sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd | 27 +++++++++++++
sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service | 13 ++++++
sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild | 59 ++++++++++++++++++++++++++++
4 files changed, 100 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 6df659a..3a08065 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,4 @@
DIST lxcfs-0.13.tar.gz 35046 SHA256 a0280b1080c95062d75fa0a3f0e743849c7cd8a88b49ff8323a665cbac75224a SHA512 bca32de4857dbcafeca0d206fd202223b35aa5918ffee9d88486cec0d7c686e9b258918204f340f666fb3ac5d382ee84706db4f5268e98c8153e4ccc5de12595 WHIRLPOOL d074d482461e8f98d55f9919eabd98cc6c015fce7f731bb99122c7b16bf40faa37a7c3ffbe2e7aa7375a0313c00e508d79863f1a60e53ab584696fe5abaec5dc
DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
+DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd
new file mode 100644
index 0000000..a850214
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service
new file mode 100644
index 0000000..ff737c7
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+
+[Service]
+ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
+KillMode=none
+Restart=on-failure
+ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild b/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild
new file mode 100644
index 0000000..f279382
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+ UPSTREAM_PV=$(replace_version_separator 3 '.' )
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+#IUSE="test"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+ virtual/pam
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+
+src_prepare() {
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-02-22 4:14 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-02-22 4:14 UTC (permalink / raw
To: gentoo-commits
commit: 7df1a62cec8c7f9341868ecc450928ae55c39cf9
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 04:15:28 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 04:15:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df1a62c
sys-fs/lxcfs: remove old
Package-Manager: portage-2.2.27
sys-fs/lxcfs/Manifest | 1 -
sys-fs/lxcfs/files/lxcfs-0.13.initd | 27 -----------------
sys-fs/lxcfs/files/lxcfs-0.13.service | 13 --------
sys-fs/lxcfs/lxcfs-0.13.ebuild | 56 -----------------------------------
4 files changed, 97 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 3a08065..8debc47 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,4 +1,3 @@
-DIST lxcfs-0.13.tar.gz 35046 SHA256 a0280b1080c95062d75fa0a3f0e743849c7cd8a88b49ff8323a665cbac75224a SHA512 bca32de4857dbcafeca0d206fd202223b35aa5918ffee9d88486cec0d7c686e9b258918204f340f666fb3ac5d382ee84706db4f5268e98c8153e4ccc5de12595 WHIRLPOOL d074d482461e8f98d55f9919eabd98cc6c015fce7f731bb99122c7b16bf40faa37a7c3ffbe2e7aa7375a0313c00e508d79863f1a60e53ab584696fe5abaec5dc
DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
diff --git a/sys-fs/lxcfs/files/lxcfs-0.13.initd b/sys-fs/lxcfs/files/lxcfs-0.13.initd
deleted file mode 100755
index a850214..0000000
--- a/sys-fs/lxcfs/files/lxcfs-0.13.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-0.13.service b/sys-fs/lxcfs/files/lxcfs-0.13.service
deleted file mode 100644
index ff737c7..0000000
--- a/sys-fs/lxcfs/files/lxcfs-0.13.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-
-[Service]
-ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
-KillMode=none
-Restart=on-failure
-ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-0.13.ebuild b/sys-fs/lxcfs/lxcfs-0.13.ebuild
deleted file mode 100644
index 24afca0..0000000
--- a/sys-fs/lxcfs/lxcfs-0.13.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-#IUSE="test"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-
-src_prepare() {
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-04-02 16:06 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-04-02 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 99283bb8c1c8e7ffcf174f2334894eb3953be36c
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 16:07:27 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 16:07:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99283bb8
sys-fs/lxcfs: remove old
Package-Manager: portage-2.2.28
sys-fs/lxcfs/Manifest | 1 -
sys-fs/lxcfs/files/lxcfs-0.16.initd | 27 -----------------
sys-fs/lxcfs/files/lxcfs-0.16.service | 13 --------
sys-fs/lxcfs/lxcfs-0.16.ebuild | 56 -----------------------------------
4 files changed, 97 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 556cdef..f23f15e 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,4 +1,3 @@
-DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf759d61900cb93f4d12c517d SHA512 44b35b6c275366f88e036ed1e136cb193b65024fcbdff250658d360fced14bec84a2bcfa9f8ca28af9205f38babdd5520cfa42a5521cf545c42df80eec40c1b8 WHIRLPOOL 8972fe4838a3ec157479a9bed9404ba51d7ea47efe7e37c2b9f872fcab6068daef6898ef143304868003748a50068cc5634041020d6b6ced0acca97ffd9d8d07
DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
diff --git a/sys-fs/lxcfs/files/lxcfs-0.16.initd b/sys-fs/lxcfs/files/lxcfs-0.16.initd
deleted file mode 100755
index a850214..0000000
--- a/sys-fs/lxcfs/files/lxcfs-0.16.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-0.16.service b/sys-fs/lxcfs/files/lxcfs-0.16.service
deleted file mode 100644
index ff737c7..0000000
--- a/sys-fs/lxcfs/files/lxcfs-0.16.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-
-[Service]
-ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
-KillMode=none
-Restart=on-failure
-ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-0.16.ebuild b/sys-fs/lxcfs/lxcfs-0.16.ebuild
deleted file mode 100644
index d2b444d..0000000
--- a/sys-fs/lxcfs/lxcfs-0.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-#IUSE="test"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-
-src_prepare() {
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-06-13 15:19 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-06-13 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 917e22906ca9bd831f26b2f3fc1b65ab71601873
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 15:18:52 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 15:18:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917e2290
sys-fs/lxcfs: bump to 2.0.1
Package-Manager: portage-2.3.0_rc1
sys-fs/lxcfs/Manifest | 1 +
sys-fs/lxcfs/files/lxcfs-2.0.1.initd | 27 ++++++++++++++++
sys-fs/lxcfs/files/lxcfs-2.0.1.service | 13 ++++++++
sys-fs/lxcfs/lxcfs-2.0.1.ebuild | 59 ++++++++++++++++++++++++++++++++++
4 files changed, 100 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index f23f15e..fa7dd62 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,4 @@
DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf759d61900cb93f4d12c517d SHA512 44b35b6c275366f88e036ed1e136cb193b65024fcbdff250658d360fced14bec84a2bcfa9f8ca28af9205f38babdd5520cfa42a5521cf545c42df80eec40c1b8 WHIRLPOOL 8972fe4838a3ec157479a9bed9404ba51d7ea47efe7e37c2b9f872fcab6068daef6898ef143304868003748a50068cc5634041020d6b6ced0acca97ffd9d8d07
DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
+DIST lxcfs-2.0.1.tar.gz 49004 SHA256 4731a4d6939e32f3503560ee953e840d16e6abbb4fc7993c92cc1179e40d4f84 SHA512 3801a1d643b1f4478e702f615c8f9f9bc7070272ef2cca6c22d944a680f6829f0b14b7d193cc5c046f9f1a0a258bd5de68456d884a00d48f0f2639c66975cb23 WHIRLPOOL cbbad76d61a05dbb4750cd8218e1946d6b8b2e798f0a4071c6e706ee6d88a0e36dd9fcc8664c9cb0e3f8bdbac9ba6c548ce0a0829a4bf79d0965f18ee207bb90
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.1.initd b/sys-fs/lxcfs/files/lxcfs-2.0.1.initd
new file mode 100644
index 0000000..7436eee
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.1.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.1.service b/sys-fs/lxcfs/files/lxcfs-2.0.1.service
new file mode 100644
index 0000000..ff737c7
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.1.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+
+[Service]
+ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
+KillMode=none
+Restart=on-failure
+ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-2.0.1.ebuild b/sys-fs/lxcfs/lxcfs-2.0.1.ebuild
new file mode 100644
index 0000000..7cc6d80
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+ UPSTREAM_PV=$(replace_version_separator 3 '.' )
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+#IUSE="test"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+ virtual/pam
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+
+src_prepare() {
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-07-11 2:39 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-07-11 2:39 UTC (permalink / raw
To: gentoo-commits
commit: 51b92272875fc9faff130e242c421874a089e011
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 02:39:06 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 02:39:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b92272
sys-fs/lxcfs: Bump to 2.0.2
Adds pam use flag, uses (patched) upstream systemd service file not our own
Package-Manager: portage-2.3.0
sys-fs/lxcfs/Manifest | 1 +
.../lxcfs/files/lxcfs-2.0.2-fusermount-path.patch | 11 ++++
sys-fs/lxcfs/files/lxcfs-2.0.2.initd | 27 ++++++++++
sys-fs/lxcfs/lxcfs-2.0.2.ebuild | 63 ++++++++++++++++++++++
4 files changed, 102 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index fa7dd62..80dc109 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -2,3 +2,4 @@ DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2
DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf759d61900cb93f4d12c517d SHA512 44b35b6c275366f88e036ed1e136cb193b65024fcbdff250658d360fced14bec84a2bcfa9f8ca28af9205f38babdd5520cfa42a5521cf545c42df80eec40c1b8 WHIRLPOOL 8972fe4838a3ec157479a9bed9404ba51d7ea47efe7e37c2b9f872fcab6068daef6898ef143304868003748a50068cc5634041020d6b6ced0acca97ffd9d8d07
DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
DIST lxcfs-2.0.1.tar.gz 49004 SHA256 4731a4d6939e32f3503560ee953e840d16e6abbb4fc7993c92cc1179e40d4f84 SHA512 3801a1d643b1f4478e702f615c8f9f9bc7070272ef2cca6c22d944a680f6829f0b14b7d193cc5c046f9f1a0a258bd5de68456d884a00d48f0f2639c66975cb23 WHIRLPOOL cbbad76d61a05dbb4750cd8218e1946d6b8b2e798f0a4071c6e706ee6d88a0e36dd9fcc8664c9cb0e3f8bdbac9ba6c548ce0a0829a4bf79d0965f18ee207bb90
+DIST lxcfs-2.0.2.tar.gz 49185 SHA256 f3e9c7d53f25c2e71745dbef4c1b96d301fac12cb041329f3bbe438d7d7a4eda SHA512 358ea0d56d02a45cf93799663e067dc14fa6056f63b9047a7c7691ff0ff0ea44312be19baa0438887708de0fe85e10599e6c0178fbcbe483a6aaa56318c46fdd WHIRLPOOL 590ca502c2f72016b58d7fdb43db94ee1fa6f1af5fe9bd7d3b33d0f97fbff766b5adb22356d12f53601f070acb48d7645faa25128168094c8d42db9b39fa0263
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch
new file mode 100644
index 0000000..ab25fa8
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch
@@ -0,0 +1,11 @@
+--- config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
++++ config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
+@@ -7,7 +7,7 @@
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.2.initd b/sys-fs/lxcfs/files/lxcfs-2.0.2.initd
new file mode 100644
index 0000000..7436eee
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.2.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.2.ebuild b/sys-fs/lxcfs/lxcfs-2.0.2.ebuild
new file mode 100644
index 0000000..f31b42f
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+ UPSTREAM_PV=$(replace_version_separator 3 '.' )
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+IUSE="pam"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+ virtual/pam
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fusermount-path.patch
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ use pam || pamflag="--with-pamdir=none"
+
+ # Without the localstatedir the filesystem isn't mounted correctly
+ econf --localstatedir=/var ${pamflag}
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2016-10-11 3:41 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2016-10-11 3:41 UTC (permalink / raw
To: gentoo-commits
commit: 8a0d2cf4640ec4c6311b10d6d482afd4a88b605b
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 03:41:38 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 03:41:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0d2cf4
sys-fs/lxcfs: Remove old
Package-Manager: portage-2.3.1
sys-fs/lxcfs/Manifest | 5 --
sys-fs/lxcfs/files/lxcfs-0.17.initd | 27 ----------
sys-fs/lxcfs/files/lxcfs-0.17.service | 13 -----
sys-fs/lxcfs/files/lxcfs-2.0.0.initd | 27 ----------
sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd | 27 ----------
sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service | 13 -----
sys-fs/lxcfs/files/lxcfs-2.0.1.initd | 27 ----------
sys-fs/lxcfs/files/lxcfs-2.0.1.service | 13 -----
.../lxcfs/files/lxcfs-2.0.2-fusermount-path.patch | 11 ----
sys-fs/lxcfs/files/lxcfs-2.0.2.initd | 27 ----------
sys-fs/lxcfs/lxcfs-0.17.ebuild | 57 --------------------
sys-fs/lxcfs/lxcfs-2.0.0.ebuild | 59 --------------------
sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild | 59 --------------------
sys-fs/lxcfs/lxcfs-2.0.1.ebuild | 59 --------------------
sys-fs/lxcfs/lxcfs-2.0.2.ebuild | 63 ----------------------
15 files changed, 487 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 16a455d..2871694 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,7 +1,2 @@
-DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
-DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf759d61900cb93f4d12c517d SHA512 44b35b6c275366f88e036ed1e136cb193b65024fcbdff250658d360fced14bec84a2bcfa9f8ca28af9205f38babdd5520cfa42a5521cf545c42df80eec40c1b8 WHIRLPOOL 8972fe4838a3ec157479a9bed9404ba51d7ea47efe7e37c2b9f872fcab6068daef6898ef143304868003748a50068cc5634041020d6b6ced0acca97ffd9d8d07
-DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
-DIST lxcfs-2.0.1.tar.gz 49004 SHA256 4731a4d6939e32f3503560ee953e840d16e6abbb4fc7993c92cc1179e40d4f84 SHA512 3801a1d643b1f4478e702f615c8f9f9bc7070272ef2cca6c22d944a680f6829f0b14b7d193cc5c046f9f1a0a258bd5de68456d884a00d48f0f2639c66975cb23 WHIRLPOOL cbbad76d61a05dbb4750cd8218e1946d6b8b2e798f0a4071c6e706ee6d88a0e36dd9fcc8664c9cb0e3f8bdbac9ba6c548ce0a0829a4bf79d0965f18ee207bb90
-DIST lxcfs-2.0.2.tar.gz 49185 SHA256 f3e9c7d53f25c2e71745dbef4c1b96d301fac12cb041329f3bbe438d7d7a4eda SHA512 358ea0d56d02a45cf93799663e067dc14fa6056f63b9047a7c7691ff0ff0ea44312be19baa0438887708de0fe85e10599e6c0178fbcbe483a6aaa56318c46fdd WHIRLPOOL 590ca502c2f72016b58d7fdb43db94ee1fa6f1af5fe9bd7d3b33d0f97fbff766b5adb22356d12f53601f070acb48d7645faa25128168094c8d42db9b39fa0263
DIST lxcfs-2.0.3.tar.gz 51078 SHA256 742a6cc463dc66179c334ebca4c3276888ef27a564e5e47212b60c655a811a72 SHA512 14caa2d6598529610ef6bd4c1d6f4d4598e8dc1378a3ee35ea7a1582c11150c896facc80216e67526384995891d9cc1244796860b790ecfc8bf735cc2cd80923 WHIRLPOOL f2de2438e4e521db5135ca81daceccdc1d3820907de9d37842c9bafa112cc416774cb2efe27b815cecccc26e55617c7eb9f5d076df5423ab354747605fa90643
DIST lxcfs-2.0.4.tar.gz 52639 SHA256 9af8199dba2837542ede6e50489100220472241e4b355b685e66c9a72bbcf81a SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90 WHIRLPOOL 1ac966bab786b00a236225e1856c46fa9d419e42853edcd1181fc3f43d54becb60435fa0679a6a0f838a5edeb920205e3baa734118a4b5d9587e547fd63e3704
diff --git a/sys-fs/lxcfs/files/lxcfs-0.17.initd b/sys-fs/lxcfs/files/lxcfs-0.17.initd
deleted file mode 100755
index 20e046c..00000000
--- a/sys-fs/lxcfs/files/lxcfs-0.17.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-0.17.service b/sys-fs/lxcfs/files/lxcfs-0.17.service
deleted file mode 100644
index ff737c7..00000000
--- a/sys-fs/lxcfs/files/lxcfs-0.17.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-
-[Service]
-ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
-KillMode=none
-Restart=on-failure
-ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.0.initd b/sys-fs/lxcfs/files/lxcfs-2.0.0.initd
deleted file mode 100644
index 20e046c..00000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.0.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd
deleted file mode 100644
index 20e046c..00000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service
deleted file mode 100644
index ff737c7..00000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-
-[Service]
-ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
-KillMode=none
-Restart=on-failure
-ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.1.initd b/sys-fs/lxcfs/files/lxcfs-2.0.1.initd
deleted file mode 100644
index 7436eee..00000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.1.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.1.service b/sys-fs/lxcfs/files/lxcfs-2.0.1.service
deleted file mode 100644
index ff737c7..00000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.1.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-
-[Service]
-ExecStart=/usr/bin/lxcfs -f -o allow_other /var/lib/lxcfs
-KillMode=none
-Restart=on-failure
-ExecStop=/usr/bin/fusermount -u /var/lib/lxcfs
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch
deleted file mode 100644
index ab25fa8..00000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
-+++ config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
-@@ -7,7 +7,7 @@
- ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
-
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.2.initd b/sys-fs/lxcfs/files/lxcfs-2.0.2.initd
deleted file mode 100644
index 7436eee..00000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.2.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/lxcfs-0.17.ebuild b/sys-fs/lxcfs/lxcfs-0.17.ebuild
deleted file mode 100644
index 21f896c..00000000
--- a/sys-fs/lxcfs/lxcfs-0.17.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-#IUSE="test"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
- virtual/pam
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-
-src_prepare() {
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.0.ebuild b/sys-fs/lxcfs/lxcfs-2.0.0.ebuild
deleted file mode 100644
index 7cc6d80..00000000
--- a/sys-fs/lxcfs/lxcfs-2.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
- UPSTREAM_PV=$(replace_version_separator 3 '.' )
- SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-#IUSE="test"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
- virtual/pam
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-
-src_prepare() {
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild b/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild
deleted file mode 100644
index f279382..00000000
--- a/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
- UPSTREAM_PV=$(replace_version_separator 3 '.' )
- SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-#IUSE="test"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
- virtual/pam
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-
-src_prepare() {
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_newunit "${FILESDIR}/${P}.service" lxcfs.service
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.1.ebuild b/sys-fs/lxcfs/lxcfs-2.0.1.ebuild
deleted file mode 100644
index 7cc6d80..00000000
--- a/sys-fs/lxcfs/lxcfs-2.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
- UPSTREAM_PV=$(replace_version_separator 3 '.' )
- SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-#IUSE="test"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
- virtual/pam
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-
-src_prepare() {
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.2.ebuild b/sys-fs/lxcfs/lxcfs-2.0.2.ebuild
deleted file mode 100644
index f31b42f..00000000
--- a/sys-fs/lxcfs/lxcfs-2.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
- UPSTREAM_PV=$(replace_version_separator 3 '.' )
- SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-IUSE="pam"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
- virtual/pam
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fusermount-path.patch
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- use pam || pamflag="--with-pamdir=none"
-
- # Without the localstatedir the filesystem isn't mounted correctly
- econf --localstatedir=/var ${pamflag}
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2017-03-20 2:05 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2017-03-20 2:05 UTC (permalink / raw
To: gentoo-commits
commit: e3e0e087b3efc6d1ba2c93b8bbaa65c03b1ad2eb
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 02:02:40 2017 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 02:02:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3e0e087
sys-fs/lxcfs: version bump to 2.0.6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-fs/lxcfs/Manifest | 1 +
.../lxcfs/files/lxcfs-2.0.6-fusermount-path.patch | 11 ++++
sys-fs/lxcfs/files/lxcfs-2.0.6.initd | 26 ++++++++
sys-fs/lxcfs/lxcfs-2.0.6.ebuild | 70 ++++++++++++++++++++++
4 files changed, 108 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 2871694fdde..f159e85e3f6 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,2 +1,3 @@
DIST lxcfs-2.0.3.tar.gz 51078 SHA256 742a6cc463dc66179c334ebca4c3276888ef27a564e5e47212b60c655a811a72 SHA512 14caa2d6598529610ef6bd4c1d6f4d4598e8dc1378a3ee35ea7a1582c11150c896facc80216e67526384995891d9cc1244796860b790ecfc8bf735cc2cd80923 WHIRLPOOL f2de2438e4e521db5135ca81daceccdc1d3820907de9d37842c9bafa112cc416774cb2efe27b815cecccc26e55617c7eb9f5d076df5423ab354747605fa90643
DIST lxcfs-2.0.4.tar.gz 52639 SHA256 9af8199dba2837542ede6e50489100220472241e4b355b685e66c9a72bbcf81a SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90 WHIRLPOOL 1ac966bab786b00a236225e1856c46fa9d419e42853edcd1181fc3f43d54becb60435fa0679a6a0f838a5edeb920205e3baa734118a4b5d9587e547fd63e3704
+DIST lxcfs-2.0.6.tar.gz 62632 SHA256 be4ea891887aee2c04b2d9ff5dbb6866178cc1276119f5b116bf3f99c7750213 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d WHIRLPOOL 0d7fc69400678f03dd8ccb06fee643feaa62469e6287a6bc3935232f775bc93fa5c1d649e7747b3b09867f2678593eaf923c947499c549cfd6c40fcd28620a95
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch
new file mode 100644
index 00000000000..61d3494fb7f
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch
@@ -0,0 +1,11 @@
+--- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
++++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
+@@ -7,7 +7,7 @@
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.6.initd b/sys-fs/lxcfs/files/lxcfs-2.0.6.initd
new file mode 100644
index 00000000000..dfc5725f693
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.6.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.6.ebuild b/sys-fs/lxcfs/lxcfs-2.0.6.ebuild
new file mode 100644
index 00000000000..bc296b6a704
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+ UPSTREAM_PV=$(replace_version_separator 3 '.' )
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+IUSE="pam"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+ virtual/pam
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+
+src_prepare() {
+ default
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ use pam || pamflag="--with-pamdir=none"
+
+ # Without the localstatedir the filesystem isn't mounted correctly
+ econf --localstatedir=/var ${pamflag}
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
+
+pkg_preinst() {
+ # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
+ # fails because that is a live mountpoint when the service is
+ # running. It's unnecessary anyway so skip the action.
+ [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2018-04-08 19:43 Erik Mackdanz
0 siblings, 0 replies; 18+ messages in thread
From: Erik Mackdanz @ 2018-04-08 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 4b8ffd26f1eddf2da6844f38767968f6d6e9fbf3
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 8 19:42:57 2018 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 19:42:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8ffd26
sys-fs/lxcfs: bump to 3.0.0
Closes: https://bugs.gentoo.org/652392
Package-Manager: Portage-2.3.26, Repoman-2.3.7
sys-fs/lxcfs/Manifest | 1 +
.../lxcfs/files/lxcfs-3.0.0-fusermount-path.patch | 11 ++++
sys-fs/lxcfs/files/lxcfs-3.0.0.initd | 26 ++++++++
sys-fs/lxcfs/lxcfs-3.0.0.ebuild | 74 ++++++++++++++++++++++
sys-fs/lxcfs/metadata.xml | 4 ++
5 files changed, 116 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 0ce70b19999..7536f41bd56 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,2 +1,3 @@
DIST lxcfs-2.0.4.tar.gz 52639 BLAKE2B 4ef8509b05ac98338003801afeb67a15fcfd1270f90e7b5d1970c4171b9296b77e116f91ec29ec29f3feb0e03c5f2ddf49d014824869aa6cf9897441ebac17a3 SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90
DIST lxcfs-2.0.6.tar.gz 62632 BLAKE2B 2bc76de0a7e2657b0d73e79260bfaf5a1ba070a4571d81a7c26d3637fc93937c824496119ff32fbfa56b6f97deca4bb145a952862aff148932531c489eea57a9 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d
+DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch
new file mode 100644
index 00000000000..61d3494fb7f
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch
@@ -0,0 +1,11 @@
+--- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
++++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
+@@ -7,7 +7,7 @@
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.0.initd b/sys-fs/lxcfs/files/lxcfs-3.0.0.initd
new file mode 100644
index 00000000000..a34e74af7b6
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-3.0.0.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-3.0.0.ebuild b/sys-fs/lxcfs/lxcfs-3.0.0.ebuild
new file mode 100644
index 00000000000..1e619383c4c
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-3.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+ UPSTREAM_PV=$(replace_version_separator 3 '.' )
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse:0
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+
+src_prepare() {
+ default
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ # Without the localstatedir the filesystem isn't mounted correctly
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ keepdir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
+
+pkg_preinst() {
+ # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
+ # fails because that is a live mountpoint when the service is
+ # running. It's unnecessary anyway so skip the action.
+ [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and"
+ einfo "will eventually be available in app-emulation/lxc. See:"
+ einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html"
+ einfo "for more information."
+ einfo
+}
diff --git a/sys-fs/lxcfs/metadata.xml b/sys-fs/lxcfs/metadata.xml
index 82ba2497b61..9ed77f5faf5 100644
--- a/sys-fs/lxcfs/metadata.xml
+++ b/sys-fs/lxcfs/metadata.xml
@@ -9,6 +9,10 @@
<email>john@irc.tm</email>
<name>John Cooke</name>
</maintainer>
+ <maintainer type="project">
+ <email>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+ </maintainer>
<longdescription>
LXCFS is a simple userspace filesystem designed to
provide a cgroupfs-like tree which is container aware
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2020-05-15 5:20 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2020-05-15 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 90b61eec7b3a7507c25d743cc6e769f9d116b05b
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 15:51:05 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 15 05:20:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b61eec
sys-fs/lxcfs: bump to 4.0.3
Closes: https://bugs.gentoo.org/698722
Closes: https://bugs.gentoo.org/712802
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/lxcfs/Manifest | 1 +
sys-fs/lxcfs/files/lxcfs-4.0.0.confd | 7 +++++
sys-fs/lxcfs/files/lxcfs-4.0.0.initd | 26 ++++++++++++++++++
sys-fs/lxcfs/lxcfs-4.0.3.ebuild | 53 ++++++++++++++++++++++++++++++++++++
4 files changed, 87 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 19f83ee280e..699568b0724 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1 +1,2 @@
DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
+DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.confd b/sys-fs/lxcfs/files/lxcfs-4.0.0.confd
new file mode 100644
index 00000000000..ba443ee4b1f
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/lxcfs: config file for /etc/init.d/lxcfs
+
+# lxcfs options:
+# -l == calculate container load average instead of displaying host load average
+# -u == don't display swap usage to containers
+
+LXCFS_OPTS="-l -u"
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.initd b/sys-fs/lxcfs/files/lxcfs-4.0.0.initd
new file mode 100644
index 00000000000..d9368e4f28c
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs."
+ /sbin/modprobe -q fuse
+ install -d /var/lib/lxcfs
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- ${LXCFS_OPTS} \
+ /var/lib/lxcfs
+ eend ${?}
+}
+
+stop() {
+ ebegin "Stopping lxcfs."
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend ${?}
+}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
new file mode 100644
index 00000000000..1e51a567378
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+ default
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ # Without the localstatedir the filesystem isn't mounted correctly
+ econf --localstatedir=/var
+}
+
+src_test() {
+ emake tests
+ tests/main.sh || die "Tests failed"
+}
+
+src_install() {
+ default
+
+ dodir /var/lib/lxcfs
+ keepdir /var/lib/lxcfs
+
+ newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+ newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2020-06-21 17:02 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2020-06-21 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 019d6bc22c11aa9bb41510b920d579feb2c48316
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 16:48:03 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 17:02:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019d6bc2
sys-fs/lxcfs: update fusermount path to systemd service file, #728470
Closes: https://bugs.gentoo.org/728470
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/lxcfs/files/lxcfs.service | 16 ++++++++++++++++
.../lxcfs/{lxcfs-4.0.4.ebuild => lxcfs-4.0.4-r1.ebuild} | 5 ++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/sys-fs/lxcfs/files/lxcfs.service b/sys-fs/lxcfs/files/lxcfs.service
new file mode 100644
index 00000000000..aea0d6d920f
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+Documentation=man:lxcfs(1)
+
+[Service]
+ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
+KillMode=process
+Restart=on-failure
+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+Delegate=yes
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-4.0.4.ebuild b/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
similarity index 86%
rename from sys-fs/lxcfs/lxcfs-4.0.4.ebuild
rename to sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
index f1d2fdcd767..583ac4fcfa6 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.4.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
@@ -44,5 +44,8 @@ src_install() {
newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
+
+ # Provide our own service file (copy of upstream) due to paths being different from upstream,
+ # 728470
+ systemd_dounit "${FILESDIR}"/lxcfs.service
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2020-07-13 7:16 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2020-07-13 7:16 UTC (permalink / raw
To: gentoo-commits
commit: cbde434758c938aa1452aa31818fcb3b8fd73245
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 06:17:59 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 07:15:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbde4347
sys-fs/lxcfs: systemd related fixes, #732364
Closes: https://bugs.gentoo.org/732364
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/lxcfs/files/lxcfs-4.0.0.service | 18 ++++++++++++++++++
.../{lxcfs-4.0.4-r1.ebuild => lxcfs-4.0.4-r2.ebuild} | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.service b/sys-fs/lxcfs/files/lxcfs-4.0.0.service
new file mode 100644
index 00000000000..0bdab880a79
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+Documentation=man:lxcfs(1)
+
+[Service]
+ExecStartPre=/sbin/modprobe -q fuse
+ExecStartPre=install -d /var/lib/lxcfs
+ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
+KillMode=process
+Restart=on-failure
+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+Delegate=yes
+ExecReload=/bin/kill -USR1 ${MAINPID}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild b/sys-fs/lxcfs/lxcfs-4.0.4-r2.ebuild
similarity index 94%
rename from sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
rename to sys-fs/lxcfs/lxcfs-4.0.4-r2.ebuild
index 583ac4fcfa6..ad87ebdf52b 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.4-r2.ebuild
@@ -47,5 +47,5 @@ src_install() {
# Provide our own service file (copy of upstream) due to paths being different from upstream,
# 728470
- systemd_dounit "${FILESDIR}"/lxcfs.service
+ systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2020-09-03 10:08 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2020-09-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 47894e450fdd674572d7aa14f948b3cd7b8c6bf9
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 10:05:37 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 10:08:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47894e45
sys-fs/lxcfs: remove old 4.0.3
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/lxcfs/Manifest | 1 -
sys-fs/lxcfs/files/lxcfs.service | 16 ------------
sys-fs/lxcfs/lxcfs-4.0.3.ebuild | 54 ----------------------------------------
3 files changed, 71 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 2f478b27028..344a876047c 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,2 +1 @@
-DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
DIST lxcfs-4.0.5.tar.gz 101842 BLAKE2B c916473e1b7ad42b8f69026a16810941c999d44ffcf1d456cb301411965f05e626338a5bde1e38fe99acd05f72bbcd5acbdcb2f65fa5ec183c967babcb8c70fd SHA512 5c44aa7f43071a4316cc8702928fde2c928bd5654c9ab4d540152839db0d7dd235a861f263da56f02611941d46d22eee98e0cdd52aeaeda99f3c79c754d420a1
diff --git a/sys-fs/lxcfs/files/lxcfs.service b/sys-fs/lxcfs/files/lxcfs.service
deleted file mode 100644
index aea0d6d920f..00000000000
--- a/sys-fs/lxcfs/files/lxcfs.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-Documentation=man:lxcfs(1)
-
-[Service]
-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
-KillMode=process
-Restart=on-failure
-ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
-Delegate=yes
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
deleted file mode 100644
index de32fe294cb..00000000000
--- a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-# acct-group/lxd needed for the fowners below.
-RDEPEND="dev-libs/glib:2
- sys-fs/fuse:0"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/help2man"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # Without the localstatedir the filesystem isn't mounted correctly
- # Without with-distro ./configure will fail when cross-compiling
- econf --localstatedir=/var --with-distro=gentoo
-}
-
-src_test() {
- emake tests
- tests/main.sh || die "Tests failed"
-}
-
-src_install() {
- default
-
- # Getting weird file collisions,
- # keepdir /var/lib/lxcfs
- # fowners -R root:lxd /var/lib/lxcfs
-
- newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
- newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/
@ 2023-09-05 7:31 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2023-09-05 7:31 UTC (permalink / raw
To: gentoo-commits
commit: cd73ce1d3249c9259abfc8a8b9a74e29a8b3cfa7
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Sep 5 04:21:04 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 07:30:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd73ce1d
sys-fs/lxcfs: Fix incompatible integer to pointer conversion
Closes: https://bugs.gentoo.org/894348
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32616
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...5.0.4-fix-incompatible-pointer-conversion.patch | 19 +++++
sys-fs/lxcfs/lxcfs-5.0.4-r1.ebuild | 84 ++++++++++++++++++++++
2 files changed, 103 insertions(+)
diff --git a/sys-fs/lxcfs/files/lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch b/sys-fs/lxcfs/files/lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch
new file mode 100644
index 000000000000..bead63bd52dd
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch
@@ -0,0 +1,19 @@
+Bug: https://bugs.gentoo.org/894348
+Upstream PR: https://github.com/lxc/lxcfs/pull/610
+--- a/src/proc_loadavg.c
++++ b/src/proc_loadavg.c
+@@ -603,12 +603,12 @@ pthread_t load_daemon(int load_use)
+
+ ret = init_load();
+ if (ret == -1)
+- return log_error(0, "Initialize hash_table fails in load_daemon!");
++ return (pthread_t) log_error(0, "Initialize hash_table fails in load_daemon!");
+
+ ret = pthread_create(&pid, NULL, load_begin, NULL);
+ if (ret != 0) {
+ load_free();
+- return log_error(0, "Create pthread fails in load_daemon!");
++ return (pthread_t) log_error(0, "Create pthread fails in load_daemon!");
+ }
+
+ /* use loadavg, here loadavg = 1*/
diff --git a/sys-fs/lxcfs/lxcfs-5.0.4-r1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.4-r1.ebuild
new file mode 100644
index 000000000000..6d2a14c5eb13
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-5.0.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit cmake meson python-any-r1 systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+ verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0 LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc test"
+
+DEPEND="sys-fs/fuse:3"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+ virtual/pkgconfig
+ $(python_gen_any_dep '
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
+ doc? ( sys-apps/help2man )
+ verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Needs some black magic to work inside container/chroot.
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.0.4-fix-incompatible-pointer-conversion.patch
+)
+
+python_check_deps() {
+ python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Fix python shebangs for python-exec[-native-symlinks], #851480
+ local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+ python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+ local emesonargs=(
+ --localstatedir "${EPREFIX}/var"
+
+ $(meson_use doc docs)
+ $(meson_use test tests)
+
+ -Dfuse-version=3
+ -Dinit-script=""
+ -Dwith-init-script=""
+ )
+
+ meson_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
+ ./main.sh || die
+}
+
+src_install() {
+ meson_src_install
+
+ newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs
+ newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs
+
+ # Provide our own service file (copy of upstream) due to paths being different from upstream,
+ # #728470
+ systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-09-05 7:31 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-20 2:05 [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/, sys-fs/lxcfs/files/ Erik Mackdanz
-- strict thread matches above, loose matches on Subject: below --
2023-09-05 7:31 Joonas Niilola
2020-09-03 10:08 Joonas Niilola
2020-07-13 7:16 Joonas Niilola
2020-06-21 17:02 Joonas Niilola
2020-05-15 5:20 Joonas Niilola
2018-04-08 19:43 Erik Mackdanz
2016-10-11 3:41 Erik Mackdanz
2016-07-11 2:39 Erik Mackdanz
2016-06-13 15:19 Erik Mackdanz
2016-04-02 16:06 Erik Mackdanz
2016-02-22 4:14 Erik Mackdanz
2016-02-22 4:11 Erik Mackdanz
2016-01-28 16:51 Erik Mackdanz
2016-01-28 16:49 Erik Mackdanz
2016-01-09 3:26 Erik Mackdanz
2015-12-12 2:33 Erik Mackdanz
2015-11-21 18:30 Erik Mackdanz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox