summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-07-04 18:38:19 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-07-04 18:59:13 -0700
commit2247323ce9e28f424b66eca83680f52d55a851b8 (patch)
tree8e9f2f14fc26c73d39460f15ee0bd6439a022ca9 /sys-fs/zfs/zfs-9999.ebuild
parentgames-action/maelstrom: Fix build system (diff)
downloadgentoo-2247323ce9e28f424b66eca83680f52d55a851b8.tar.gz
gentoo-2247323ce9e28f424b66eca83680f52d55a851b8.tar.bz2
gentoo-2247323ce9e28f424b66eca83680f52d55a851b8.zip
sys-fs/zfs: update live ebuild, fix pam dir removal
Closes: https://bugs.gentoo.org/730772 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'sys-fs/zfs/zfs-9999.ebuild')
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index b388cd53e3a0..143aae5241d8 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -130,7 +130,7 @@ src_configure() {
--with-linux="${KV_DIR}"
--with-linux-obj="${KV_OUT_DIR}"
--with-udevdir="$(get_udevdir)"
- --with-pamconfigsdir=/dev/null # debian configs
+ --with-pamconfigsdir="${EPREFIX}/unwanted_debian_files"
--with-pammoduledir="$(getpam_mod_dir)"
--with-python="${EPYTHON}"
--with-systemdunitdir="$(systemd_get_systemunitdir)"
@@ -158,7 +158,9 @@ src_install() {
gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
- use test-suite || rm -rf "${ED}/usr/share/zfs"
+ use pam && { rm -rv "${ED}/unwanted_debian_files" || die ; }
+
+ use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
if ! use static-libs; then
find "${ED}/" -name '*.la' -delete || die