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>j...@irc.tm</email> <name>John Cooke</name> </maintainer> + <maintainer type="project"> + <email>virtualizat...@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
