diff options
author | Erik Mackdanz <stasibear@gentoo.org> | 2016-07-10 21:39:06 -0500 |
---|---|---|
committer | Erik Mackdanz <stasibear@gentoo.org> | 2016-07-10 21:39:06 -0500 |
commit | 51b92272875fc9faff130e242c421874a089e011 (patch) | |
tree | 76c740684815f7fa31bcc1b46b82867308f0a380 /sys-fs/lxcfs | |
parent | 7cd30f93ff9444fe97fe6ed2f44979c8598cf26a (diff) | |
download | gentoo-51b92272875fc9faff130e242c421874a089e011.tar.gz gentoo-51b92272875fc9faff130e242c421874a089e011.tar.xz |
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
Diffstat (limited to 'sys-fs/lxcfs')
-rw-r--r-- | sys-fs/lxcfs/Manifest | 1 | ||||
-rw-r--r-- | sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch | 11 | ||||
-rw-r--r-- | sys-fs/lxcfs/files/lxcfs-2.0.2.initd | 27 | ||||
-rw-r--r-- | sys-fs/lxcfs/lxcfs-2.0.2.ebuild | 63 |
4 files changed, 102 insertions, 0 deletions
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index fa7dd622b8a..80dc10972e7 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 00000000000..ab25fa87347 --- /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 00000000000..7436eeed39a --- /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 00000000000..f31b42fa22f --- /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 +} |