summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-08-26 20:03:09 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-08-26 20:03:23 -0700
commitc31aca67fbcb0c9e360a4dfde0a78c4ab44d9399 (patch)
tree64e4453c6d06730fc4c70ec91b53605191364eef
parentprofiles/arch/powerpc/ppc64/package.use.mask: really unmask grub[libzfs] (diff)
downloadgentoo-c31aca67.tar.gz
gentoo-c31aca67.tar.bz2
gentoo-c31aca67.zip
sys-fs/zfs: update live ebuild, add minimal useflag
it can be used to avoid python dependency completely Bug: https://bugs.gentoo.org/701522 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--sys-fs/zfs/metadata.xml1
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild18
2 files changed, 12 insertions, 7 deletions
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index 85d50d081aff..9ce9230943f9 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -11,6 +11,7 @@
</maintainer>
<use>
<flag name="kernel-builtin">Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree</flag>
+ <flag name="minimal">Don't install python scripts (arcstat, dbufstat etc) and avoid dependency on <pkg>dev-lang/python</pkg></flag>
<flag name="pam">Install zfs_key pam module, for automatically loading zfs encryption keys for home datasets</flag>
<flag name="rootfs">Enable dependencies required for booting off a pool containing a rootfs</flag>
<flag name="test-suite">Install regression test suite</flag>
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 11bc0febcb0a..4c5e4f2901ca 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -21,10 +21,9 @@ fi
LICENSE="BSD-2 CDDL MIT"
SLOT="0"
-IUSE="custom-cflags debug kernel-builtin libressl pam python +rootfs test-suite static-libs"
+IUSE="custom-cflags debug kernel-builtin libressl minimal pam python +rootfs test-suite static-libs"
DEPEND="
- ${PYTHON_DEPS}
net-libs/libtirpc[static-libs?]
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
@@ -32,6 +31,7 @@ DEPEND="
virtual/libudev[static-libs(-)?]
libressl? ( dev-libs/libressl:0=[static-libs?] )
!libressl? ( dev-libs/openssl:0=[static-libs?] )
+ !minimal? ( ${PYTHON_DEPS} )
pam? ( sys-libs/pam )
python? (
virtual/python-cffi[${PYTHON_USEDEP}]
@@ -65,7 +65,11 @@ RDEPEND="${DEPEND}
)
"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+ !minimal? ( ${PYTHON_REQUIRED_USE} )
+ python? ( !minimal )
+ test-suite? ( !minimal )
+"
RESTRICT="test"
@@ -130,15 +134,15 @@ src_configure() {
--with-linux="${KV_DIR}"
--with-linux-obj="${KV_OUT_DIR}"
--with-udevdir="$(get_udevdir)"
- --with-pamconfigsdir="${EPREFIX}/unwanted_debian_files"
+ --with-pamconfigsdir="${EPREFIX}/unwanted_files"
--with-pammoduledir="$(getpam_mod_dir)"
- --with-python="${EPYTHON}"
--with-systemdunitdir="$(systemd_get_systemunitdir)"
--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
$(use_enable debug)
$(use_enable pam)
$(use_enable python pyzfs)
$(use_enable static-libs static)
+ $(usex minimal --without-python --with-python="${EPYTHON}")
)
econf "${myconf[@]}"
@@ -158,7 +162,7 @@ src_install() {
gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
- use pam && { rm -rv "${ED}/unwanted_debian_files" || die ; }
+ use pam && { rm -rv "${ED}/unwanted_files" || die ; }
use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
@@ -179,7 +183,7 @@ src_install() {
fi
# enforce best available python implementation
- python_fix_shebang "${ED}/bin"
+ use minimal || python_fix_shebang "${ED}/bin"
}
pkg_postinst() {