From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E8C5158020 for ; Fri, 14 Oct 2022 06:24:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAE3AE07EA; Fri, 14 Oct 2022 06:24:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F35BE07EA for ; Fri, 14 Oct 2022 06:24:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 747AE341120 for ; Fri, 14 Oct 2022 06:24:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7E565F6 for ; Fri, 14 Oct 2022 06:24:08 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1665727524.ba996569d35fcbff36dad87464c0cd0d60359370.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lxcfs/Manifest sys-fs/lxcfs/files/lxcfs-4.0.0.confd sys-fs/lxcfs/files/lxcfs-4.0.0.initd sys-fs/lxcfs/files/lxcfs-4.0.0.service sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild X-VCS-Directories: sys-fs/lxcfs/ sys-fs/lxcfs/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: ba996569d35fcbff36dad87464c0cd0d60359370 X-VCS-Branch: master Date: Fri, 14 Oct 2022 06:24:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fa75a989-db70-43b3-a660-b12c5eb78cdc X-Archives-Hash: 7927aba24dfc047fd6574f1f7ca01ca6 commit: ba996569d35fcbff36dad87464c0cd0d60359370 Author: Joonas Niilola gentoo org> AuthorDate: Fri Oct 14 06:05:24 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Oct 14 06:05:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba996569 sys-fs/lxcfs: drop 5.0.0_p20220524 Signed-off-by: Joonas Niilola 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/files/lxcfs-4.0.0.service | 18 -------- sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild | 77 ------------------------------- 5 files changed, 129 deletions(-) diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index 93e0ab7ebffd..574a1ae9db4b 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -1,3 +1,2 @@ -DIST lxcfs-5.0.0_p20220524.tar.gz 101563 BLAKE2B 2bf282aed5490d160a563ae97fdfbb887366a6ec60ea7f36f5400e4a11330c51ac3096d63c99dd4aa2ebe1a3497102af9df41ebd40e38b3bde6c6dcd4265b336 SHA512 c1183096dd2b74ef859183451b8c909f762e3c56dce0b9384ac163a6b6b3f7a17a63e840742f4cc5ac50b1f25d402583ca6cf31c1617754b35e21c5c991515f4 DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407 DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676 diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.confd b/sys-fs/lxcfs/files/lxcfs-4.0.0.confd deleted file mode 100644 index ba443ee4b1f1..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-4.0.0.confd +++ /dev/null @@ -1,7 +0,0 @@ -# /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 deleted file mode 100644 index d9368e4f28cf..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-4.0.0.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/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/files/lxcfs-4.0.0.service b/sys-fs/lxcfs/files/lxcfs-4.0.0.service deleted file mode 100644 index 0bdab880a790..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-4.0.0.service +++ /dev/null @@ -1,18 +0,0 @@ -[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-5.0.0_p20220524.ebuild b/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild deleted file mode 100644 index c9ff5e704ff7..000000000000 --- a/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake meson python-any-r1 systemd - -MY_COMMIT="18e78f70fa6764be4e4f6fcc6ae8d314da7f3a91" - -DESCRIPTION="FUSE filesystem for LXC" -HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" -SRC_URI="https://github.com/lxc/lxcfs/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - -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} - $(python_gen_any_dep ' - dev-python/jinja[${PYTHON_USEDEP}] - ') - doc? ( sys-apps/help2man )" - -# Needs some black magic to work inside container/chroot. -RESTRICT="test" - -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -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=( - $(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-4.0.0.confd lxcfs - newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs - - # Provide our own service file (copy of upstream) due to paths being different from upstream, - # #728470 - systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service -}