| 1 |
commit: 817980fcd220bc0ccc14e5ee219c0ed2652549ff |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 17 21:14:52 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 17 21:14:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=817980fc |
| 7 |
|
| 8 |
sys-fs/fuse: remove init script when EPREFIX is not empty |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/796518 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-fs/fuse/fuse-3.10.3.ebuild | 5 ++++- |
| 14 |
sys-fs/fuse/fuse-3.10.4.ebuild | 5 ++++- |
| 15 |
sys-fs/fuse/fuse-3.9.3.ebuild | 5 ++++- |
| 16 |
3 files changed, 12 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild |
| 19 |
index dd6b9a769ba..fbe409e3885 100644 |
| 20 |
--- a/sys-fs/fuse/fuse-3.10.3.ebuild |
| 21 |
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild |
| 22 |
@@ -58,7 +58,10 @@ multilib_src_test() { |
| 23 |
|
| 24 |
multilib_src_install_all() { |
| 25 |
# installed via fuse-common |
| 26 |
- rm -r "${ED}"/{etc,$(get_udevdir)} || die |
| 27 |
+ rm -r "${ED}"{/etc,$(get_udevdir)} || die |
| 28 |
+ |
| 29 |
+ # init script location is hard-coded in install_helper.sh |
| 30 |
+ rm -rf "${D}"/etc || die |
| 31 |
|
| 32 |
# useroot=false prevents the build system from doing this. |
| 33 |
use suid && fperms u+s /usr/bin/fusermount3 |
| 34 |
|
| 35 |
diff --git a/sys-fs/fuse/fuse-3.10.4.ebuild b/sys-fs/fuse/fuse-3.10.4.ebuild |
| 36 |
index e3f0349a01b..50952748065 100644 |
| 37 |
--- a/sys-fs/fuse/fuse-3.10.4.ebuild |
| 38 |
+++ b/sys-fs/fuse/fuse-3.10.4.ebuild |
| 39 |
@@ -58,7 +58,10 @@ multilib_src_test() { |
| 40 |
|
| 41 |
multilib_src_install_all() { |
| 42 |
# installed via fuse-common |
| 43 |
- rm -r "${ED}"/{etc,$(get_udevdir)} || die |
| 44 |
+ rm -r "${ED}"{/etc,$(get_udevdir)} || die |
| 45 |
+ |
| 46 |
+ # init script location is hard-coded in install_helper.sh |
| 47 |
+ rm -rf "${D}"/etc || die |
| 48 |
|
| 49 |
# useroot=false prevents the build system from doing this. |
| 50 |
use suid && fperms u+s /usr/bin/fusermount3 |
| 51 |
|
| 52 |
diff --git a/sys-fs/fuse/fuse-3.9.3.ebuild b/sys-fs/fuse/fuse-3.9.3.ebuild |
| 53 |
index e5d07d2d969..a2ef80840b8 100644 |
| 54 |
--- a/sys-fs/fuse/fuse-3.9.3.ebuild |
| 55 |
+++ b/sys-fs/fuse/fuse-3.9.3.ebuild |
| 56 |
@@ -65,7 +65,10 @@ multilib_src_test() { |
| 57 |
|
| 58 |
multilib_src_install_all() { |
| 59 |
# installed via fuse-common |
| 60 |
- rm -r "${ED}"/{etc,$(get_udevdir)} || die |
| 61 |
+ rm -r "${ED}"{/etc,$(get_udevdir)} || die |
| 62 |
+ |
| 63 |
+ # init script location is hard-coded in install_helper.sh |
| 64 |
+ rm -rf "${D}"/etc || die |
| 65 |
|
| 66 |
# useroot=false prevents the build system from doing this. |
| 67 |
use suid && fperms u+s /usr/bin/fusermount3 |
Archives