From 147d34b1e5884f2446a44224f4a15f87b8894440 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Jan 2020 12:14:23 +0000 Subject: sys-fs/zfs-{,utils} && sys-kernel/zfs-dkms : version bump (v0.8.3) --- sys-fs/zfs-utils/Manifest | 2 +- .../files/Use_NMH_WAIT_EXEC_with_call.patch | 12 -- sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild | 127 --------------------- sys-fs/zfs-utils/zfs-utils-0.8.3.ebuild | 126 ++++++++++++++++++++ sys-fs/zfs/zfs-0.8.2.ebuild | 17 --- sys-fs/zfs/zfs-0.8.3.ebuild | 17 +++ 6 files changed, 144 insertions(+), 157 deletions(-) delete mode 100644 sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch delete mode 100644 sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild create mode 100644 sys-fs/zfs-utils/zfs-utils-0.8.3.ebuild delete mode 100644 sys-fs/zfs/zfs-0.8.2.ebuild create mode 100644 sys-fs/zfs/zfs-0.8.3.ebuild (limited to 'sys-fs') diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest index 11f4cae8..9e5ed996 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496 +DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 diff --git a/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch b/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch deleted file mode 100644 index ad612d26..00000000 --- a/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c ---- a/module/zfs/vdev_disk.c 2019-09-25 21:44:42.626286618 +0100 -+++ b/module/zfs/vdev_disk.c 2020-01-02 10:29:56.356741395 +0000 -@@ -220,7 +220,7 @@ - char *envp[] = { NULL }; - - argv[2] = kmem_asprintf(SET_SCHEDULER_CMD, device, elevator); -- error = call_usermodehelper(argv[0], argv, envp, UMH_NO_WAIT); -+ error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC); - strfree(argv[2]); - #endif /* HAVE_ELEVATOR_CHANGE */ - if (error) { diff --git a/sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild b/sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild deleted file mode 100644 index 35ca27f8..00000000 --- a/sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) - -inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs udev - -MY_PN="zfs" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://zfsonlinux.org/" - -SRC_URI="https://github.com/zfsonlinux/${MY_PN}/releases/download/${MY_P}/${MY_P}.tar.gz" -KEYWORDS="~amd64" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="debug python test-suite static-libs" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - net-libs/libtirpc - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -BDEPEND="${COMMON_DEPEND} - virtual/pkgconfig - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" - "${FILESDIR}/Use_NMH_WAIT_EXEC_with_call.patch" ) - -src_prepare() { - default - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in || die - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi -} - -src_configure() { - local myconf=( - --bindir="${EPREFIX}/bin" - --disable-systemd - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-udevdir="$(get_udevdir)" - $(use_enable debug) - $(use_enable python pyzfs) - ) - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - default - - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - - use test-suite || rm -rf "${ED}/usr/share/zfs" - - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - # enforce best available python implementation - python_setup - python_fix_shebang "${ED}/bin" -} diff --git a/sys-fs/zfs-utils/zfs-utils-0.8.3.ebuild b/sys-fs/zfs-utils/zfs-utils-0.8.3.ebuild new file mode 100644 index 00000000..389c5743 --- /dev/null +++ b/sys-fs/zfs-utils/zfs-utils-0.8.3.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) + +inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs udev + +MY_PN="zfs" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://zfsonlinux.org/" + +SRC_URI="https://github.com/zfsonlinux/${MY_PN}/releases/download/${MY_P}/${MY_P}.tar.gz" +KEYWORDS="~amd64" + +LICENSE="BSD-2 CDDL MIT" +SLOT="0" +IUSE="debug python test-suite static-libs" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + net-libs/libtirpc + sys-apps/util-linux[static-libs?] + sys-libs/zlib[static-libs(+)?] + virtual/awk + python? ( + virtual/python-cffi[${PYTHON_USEDEP}] + ) +" + +BDEPEND="${COMMON_DEPEND} + virtual/pkgconfig + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" + +RDEPEND="${COMMON_DEPEND} + !=sys-apps/grep-2.13* + !sys-fs/zfs-fuse + !prefix? ( virtual/udev ) + sys-fs/udev-init-scripts + test-suite? ( + sys-apps/util-linux + sys-devel/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + virtual/modutils + ) +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) + +src_prepare() { + default + # Update paths + sed -e "s|/sbin/lsmod|/bin/lsmod|" \ + -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ + -e "s|/sbin/parted|/usr/sbin/parted|" \ + -i scripts/common.sh.in || die + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi +} + +src_configure() { + local myconf=( + --bindir="${EPREFIX}/bin" + --disable-systemd + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-udevdir="$(get_udevdir)" + $(use_enable debug) + $(use_enable python pyzfs) + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + default + + gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core + + use test-suite || rm -rf "${ED}/usr/share/zfs" + + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + # enforce best available python implementation + python_setup + python_fix_shebang "${ED}/bin" +} diff --git a/sys-fs/zfs/zfs-0.8.2.ebuild b/sys-fs/zfs/zfs-0.8.2.ebuild deleted file mode 100644 index c91d103c..00000000 --- a/sys-fs/zfs/zfs-0.8.2.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="~sys-fs/zfs-utils-${PV} - ~sys-kernel/zfs-dkms-${PV}" -RDEPEND="${DEPEND}" diff --git a/sys-fs/zfs/zfs-0.8.3.ebuild b/sys-fs/zfs/zfs-0.8.3.ebuild new file mode 100644 index 00000000..c91d103c --- /dev/null +++ b/sys-fs/zfs/zfs-0.8.3.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND="~sys-fs/zfs-utils-${PV} + ~sys-kernel/zfs-dkms-${PV}" +RDEPEND="${DEPEND}" -- cgit v1.2.3