diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
tree | b9791a06ab3284e27b568412c59316c66240c682 /sys-fs/zfs/zfs-9999.ebuild | |
parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) |
gentoo resync : 22.12.2021
Diffstat (limited to 'sys-fs/zfs/zfs-9999.ebuild')
-rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 2349a5a20d00..9a69934d3bb9 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -37,7 +37,7 @@ SLOT="0/5" IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" DEPEND=" - net-libs/libtirpc + net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= @@ -62,7 +62,7 @@ BDEPEND="virtual/awk " if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" fi # awk is used for some scripts, completions, and the Dracut module @@ -78,6 +78,7 @@ RDEPEND="${DEPEND} !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( + app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc @@ -197,7 +198,7 @@ src_configure() { --with-pamconfigsdir="${EPREFIX}/unwanted_files" --with-pammoduledir="$(getpam_mod_dir)" --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" --with-vendor=gentoo # Building zfs-mount-generator.c on musl breaks as strndupa # isn't available. But systemd doesn't support musl anyway, so @@ -276,11 +277,13 @@ pkg_postinst() { fi if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" else [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \ + einfo "You should add zfs-load-key to the boot runlevel." [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ einfo "You should add zfs-mount to the boot runlevel." [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ |