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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE2681382C5 for ; Thu, 17 Jun 2021 21:17:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1120AE081A; Thu, 17 Jun 2021 21:17:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E800CE081A for ; Thu, 17 Jun 2021 21:17:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C0FC3408B8 for ; Thu, 17 Jun 2021 21:17:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5363E7A7 for ; Thu, 17 Jun 2021 21:17:32 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1623964492.817980fcd220bc0ccc14e5ee219c0ed2652549ff.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/fuse/fuse-3.10.3.ebuild sys-fs/fuse/fuse-3.10.4.ebuild sys-fs/fuse/fuse-3.9.3.ebuild X-VCS-Directories: sys-fs/fuse/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 817980fcd220bc0ccc14e5ee219c0ed2652549ff X-VCS-Branch: master Date: Thu, 17 Jun 2021 21:17:32 +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: 032c1cc8-208d-4a70-b48f-5f01c330a985 X-Archives-Hash: 2c5d36f6e53317fa71480f5d01c1cb70 commit: 817980fcd220bc0ccc14e5ee219c0ed2652549ff Author: Mike Gilbert gentoo org> AuthorDate: Thu Jun 17 21:14:52 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Jun 17 21:14:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=817980fc sys-fs/fuse: remove init script when EPREFIX is not empty Closes: https://bugs.gentoo.org/796518 Signed-off-by: Mike Gilbert gentoo.org> sys-fs/fuse/fuse-3.10.3.ebuild | 5 ++++- sys-fs/fuse/fuse-3.10.4.ebuild | 5 ++++- sys-fs/fuse/fuse-3.9.3.ebuild | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild index dd6b9a769ba..fbe409e3885 100644 --- a/sys-fs/fuse/fuse-3.10.3.ebuild +++ b/sys-fs/fuse/fuse-3.10.3.ebuild @@ -58,7 +58,10 @@ multilib_src_test() { multilib_src_install_all() { # installed via fuse-common - rm -r "${ED}"/{etc,$(get_udevdir)} || die + rm -r "${ED}"{/etc,$(get_udevdir)} || die + + # init script location is hard-coded in install_helper.sh + rm -rf "${D}"/etc || die # useroot=false prevents the build system from doing this. use suid && fperms u+s /usr/bin/fusermount3 diff --git a/sys-fs/fuse/fuse-3.10.4.ebuild b/sys-fs/fuse/fuse-3.10.4.ebuild index e3f0349a01b..50952748065 100644 --- a/sys-fs/fuse/fuse-3.10.4.ebuild +++ b/sys-fs/fuse/fuse-3.10.4.ebuild @@ -58,7 +58,10 @@ multilib_src_test() { multilib_src_install_all() { # installed via fuse-common - rm -r "${ED}"/{etc,$(get_udevdir)} || die + rm -r "${ED}"{/etc,$(get_udevdir)} || die + + # init script location is hard-coded in install_helper.sh + rm -rf "${D}"/etc || die # useroot=false prevents the build system from doing this. use suid && fperms u+s /usr/bin/fusermount3 diff --git a/sys-fs/fuse/fuse-3.9.3.ebuild b/sys-fs/fuse/fuse-3.9.3.ebuild index e5d07d2d969..a2ef80840b8 100644 --- a/sys-fs/fuse/fuse-3.9.3.ebuild +++ b/sys-fs/fuse/fuse-3.9.3.ebuild @@ -65,7 +65,10 @@ multilib_src_test() { multilib_src_install_all() { # installed via fuse-common - rm -r "${ED}"/{etc,$(get_udevdir)} || die + rm -r "${ED}"{/etc,$(get_udevdir)} || die + + # init script location is hard-coded in install_helper.sh + rm -rf "${D}"/etc || die # useroot=false prevents the build system from doing this. use suid && fperms u+s /usr/bin/fusermount3