commit: c31aca67fbcb0c9e360a4dfde0a78c4ab44d9399 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Thu Aug 27 03:03:09 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu Aug 27 03:03:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31aca67
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 <AT> gentoo.org> sys-fs/zfs/metadata.xml | 1 + sys-fs/zfs/zfs-9999.ebuild | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml index 85d50d081af..9ce9230943f 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 11bc0febcb0..4c5e4f2901c 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() {
