From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A00E913835A for ; Thu, 27 Aug 2020 03:21:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64D30E0C56; Thu, 27 Aug 2020 03:21:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA7B2E0C56 for ; Thu, 27 Aug 2020 03:21:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E5C733BF43 for ; Thu, 27 Aug 2020 03:21:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A0A62D1 for ; Thu, 27 Aug 2020 03:21:05 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1598497403.c31aca67fbcb0c9e360a4dfde0a78c4ab44d9399.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/metadata.xml sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: c31aca67fbcb0c9e360a4dfde0a78c4ab44d9399 X-VCS-Branch: master Date: Thu, 27 Aug 2020 03:21:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 17bd6275-5a7f-4141-a0fe-f6edf2f3fceb X-Archives-Hash: dad6167c452ece9d8718dc3cd46ad205 commit: c31aca67fbcb0c9e360a4dfde0a78c4ab44d9399 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Aug 27 03:03:09 2020 +0000 Commit: Georgy Yakovlev gentoo 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 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 @@ Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree + Don't install python scripts (arcstat, dbufstat etc) and avoid dependency on dev-lang/python Install zfs_key pam module, for automatically loading zfs encryption keys for home datasets Enable dependencies required for booting off a pool containing a rootfs Install regression test suite 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() {