From 770e45c1bebcfa3a1573dbb894fa2a050e71186c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 19:59:54 +0000 Subject: sys-fs/zfs && sys-fs/spl : version bump --- sys-fs/spl-utils/Manifest | 2 +- sys-fs/spl-utils/spl-utils-0.6.5.11.ebuild | 60 -------------- sys-fs/spl-utils/spl-utils-0.7.2.ebuild | 60 ++++++++++++++ sys-fs/spl/spl-0.6.5.11.ebuild | 17 ---- sys-fs/spl/spl-0.7.2.ebuild | 17 ++++ sys-fs/zfs-utils/Manifest | 2 +- sys-fs/zfs-utils/zfs-utils-0.6.5.11.ebuild | 122 ----------------------------- sys-fs/zfs-utils/zfs-utils-0.7.2.ebuild | 122 +++++++++++++++++++++++++++++ sys-fs/zfs/zfs-0.6.5.11.ebuild | 18 ----- sys-fs/zfs/zfs-0.7.2.ebuild | 18 +++++ 10 files changed, 219 insertions(+), 219 deletions(-) delete mode 100644 sys-fs/spl-utils/spl-utils-0.6.5.11.ebuild create mode 100644 sys-fs/spl-utils/spl-utils-0.7.2.ebuild delete mode 100644 sys-fs/spl/spl-0.6.5.11.ebuild create mode 100644 sys-fs/spl/spl-0.7.2.ebuild delete mode 100644 sys-fs/zfs-utils/zfs-utils-0.6.5.11.ebuild create mode 100644 sys-fs/zfs-utils/zfs-utils-0.7.2.ebuild delete mode 100644 sys-fs/zfs/zfs-0.6.5.11.ebuild create mode 100644 sys-fs/zfs/zfs-0.7.2.ebuild (limited to 'sys-fs') diff --git a/sys-fs/spl-utils/Manifest b/sys-fs/spl-utils/Manifest index 8982ab00..519ad48c 100644 --- a/sys-fs/spl-utils/Manifest +++ b/sys-fs/spl-utils/Manifest @@ -1 +1 @@ -DIST spl-0.6.5.11.tar.gz 531710 SHA256 ebab87a064985f93122ad82721ca54569a5ef20dc3579f84d18075210cf316ac SHA512 eae1641a0d528cb9182deccd309625e13abf3db88ba1cbb54947055b23d1f94b62c045f939d5e952784f19719eea5fdf85d65c5abd22b9db167ea7780bc55722 WHIRLPOOL bc528e07624f01bdd41080548ad2098e05167b9d2492a1d27ed5cdd065f843c648dfffb46634d85b9c52325ba9c3e6f921d8d9318e1c040c2d7c6e545426200f +DIST spl-0.7.2.tar.gz 547903 SHA256 c22e410c661a29acfa16caee21b82f8bb166f5b6611ec56431cd9c172ab4729e SHA512 89aef037306b29d6fde8543f2cd0ef300e3a71620a10695f57646154a6122c02a8f8907221a93ee32344c2a07a54cde4635710318dd8d67b1904b64729c3ee40 WHIRLPOOL 4240467e6188bd499511a5a16e063b912b221dc74cb9c325ba0119e9bff91c18625c6039978023920e97163af01f42210ca17e156bc6afc7f314ac8833efec20 diff --git a/sys-fs/spl-utils/spl-utils-0.6.5.11.ebuild b/sys-fs/spl-utils/spl-utils-0.6.5.11.ebuild deleted file mode 100644 index 02a1ed1b..00000000 --- a/sys-fs/spl-utils/spl-utils-0.6.5.11.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit flag-o-matic autotools-utils - -MY_PN="spl" -MY_P="${MY_PN}-${PV}" - -SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz" - -DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="debug" - -RESTRICT="debug? ( strip ) test" - -S="${WORKDIR}/${MY_P}" - -COMMON_DEPEND="dev-lang/perl - virtual/awk" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - !sys-devel/spl" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS DISCLAIMER ) - -src_prepare() { - # Workaround for hard coded path - sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ - die "Cannot patch check.sh" - - # splat is unnecessary unless we are debugging - use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; } - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-redcore/" "${S}/META" || die "Could not set Redcore release"; } - - autotools-utils_src_prepare -} - -src_configure() { - filter-ldflags -Wl,* - - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - $(use_enable debug) - ) - autotools-utils_src_configure -} diff --git a/sys-fs/spl-utils/spl-utils-0.7.2.ebuild b/sys-fs/spl-utils/spl-utils-0.7.2.ebuild new file mode 100644 index 00000000..02a1ed1b --- /dev/null +++ b/sys-fs/spl-utils/spl-utils-0.7.2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +inherit flag-o-matic autotools-utils + +MY_PN="spl" +MY_P="${MY_PN}-${PV}" + +SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz" + +DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs" +HOMEPAGE="http://zfsonlinux.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="debug" + +RESTRICT="debug? ( strip ) test" + +S="${WORKDIR}/${MY_P}" + +COMMON_DEPEND="dev-lang/perl + virtual/awk" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + !sys-devel/spl" + +AT_M4DIR="config" +AUTOTOOLS_IN_SOURCE_BUILD="1" + +DOCS=( AUTHORS DISCLAIMER ) + +src_prepare() { + # Workaround for hard coded path + sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ + die "Cannot patch check.sh" + + # splat is unnecessary unless we are debugging + use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; } + + # Set module revision number + [ ${PV} != "9999" ] && \ + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-redcore/" "${S}/META" || die "Could not set Redcore release"; } + + autotools-utils_src_prepare +} + +src_configure() { + filter-ldflags -Wl,* + + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" + --with-config=user + $(use_enable debug) + ) + autotools-utils_src_configure +} diff --git a/sys-fs/spl/spl-0.6.5.11.ebuild b/sys-fs/spl/spl-0.6.5.11.ebuild deleted file mode 100644 index 78495265..00000000 --- a/sys-fs/spl/spl-0.6.5.11.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="Solaris Porting Layer meta-package (Gentoo compatibility ebuild)" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="~sys-fs/spl-utils-${PV} - ~sys-kernel/spl-dkms-${PV}" -RDEPEND="${DEPEND}" diff --git a/sys-fs/spl/spl-0.7.2.ebuild b/sys-fs/spl/spl-0.7.2.ebuild new file mode 100644 index 00000000..78495265 --- /dev/null +++ b/sys-fs/spl/spl-0.7.2.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="Solaris Porting Layer meta-package (Gentoo compatibility ebuild)" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND="~sys-fs/spl-utils-${PV} + ~sys-kernel/spl-dkms-${PV}" +RDEPEND="${DEPEND}" diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest index 2a55259d..57246b63 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-0.6.5.11.tar.gz 2521959 SHA256 136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 WHIRLPOOL 867f6b22726ca13e43a5ff7a832610bbfd44e6c367bd314a20a7f0a03364b1c3bda1d7b3d7c3502e08249b8d8d9e8034e93d0200abb70f793352f7689e19deac +DIST zfs-0.7.2.tar.gz 6389699 SHA256 f75f4d8bbb8241e3d06321b53914e53fa22d1ccc8be89819b578b46e5d3e5cf4 SHA512 fd10350b3ba5906b8d4968cee4f9febcc475b49e7d5499209566f7cfa39f29c4c2c1a4bae0698ce98244fa66657e7956a8c170de1e5f13b1bc05d2861d2c7722 WHIRLPOOL b1e270bddf9d34a6d60a9f3d80f767d6a19a7c2ae5b51d3fe83fb28432e267d494cd5b4f003b6049a074e8bf65fa9179793dec0b40f366cea493f7993dd3d19d diff --git a/sys-fs/zfs-utils/zfs-utils-0.6.5.11.ebuild b/sys-fs/zfs-utils/zfs-utils-0.6.5.11.ebuild deleted file mode 100644 index 527ced05..00000000 --- a/sys-fs/zfs-utils/zfs-utils-0.6.5.11.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -MY_PN="zfs" -MY_P="${MY_PN}-${PV}" - -SRC_URI="https://github.com/zfsonlinux/${MY_PN}/releases/download/${MY_P}/${MY_P}.tar.gz" - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="debug +rootfs test-suite" - -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -COMMON_DEPEND="sys-apps/util-linux - sys-libs/zlib - virtual/awk" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # 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 - - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} diff --git a/sys-fs/zfs-utils/zfs-utils-0.7.2.ebuild b/sys-fs/zfs-utils/zfs-utils-0.7.2.ebuild new file mode 100644 index 00000000..527ced05 --- /dev/null +++ b/sys-fs/zfs-utils/zfs-utils-0.7.2.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev + +MY_PN="zfs" +MY_P="${MY_PN}-${PV}" + +SRC_URI="https://github.com/zfsonlinux/${MY_PN}/releases/download/${MY_P}/${MY_P}.tar.gz" + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="http://zfsonlinux.org/" + +LICENSE="BSD-2 CDDL MIT" +SLOT="0" +KEYWORDS="amd64" +IUSE="debug +rootfs test-suite" + +RESTRICT="test" + +S="${WORKDIR}/${MY_P}" + +COMMON_DEPEND="sys-apps/util-linux + sys-libs/zlib + virtual/awk" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + !=sys-apps/grep-2.13* + !sys-fs/zfs-fuse + !prefix? ( virtual/udev ) + test-suite? ( + sys-apps/util-linux + sys-devel/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + virtual/modutils + ) + rootfs? ( + app-arch/cpio + app-misc/pax-utils + !" + eerror " Block devices --->" + eerror " [ ] Loopback device support" + fi + fi + fi + fi + +} + +src_prepare() { + # 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 + + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="/usr/$(get_libdir)/dracut" + --with-udevdir="$(get_udevdir)" + --with-blkid + $(use_enable debug) + ) + autotools-utils_src_configure + + # prepare systemd unit and helper script + cat "${FILESDIR}/zfs.service.in" | \ + sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ + -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ + > "${T}/zfs.service" || die + cat "${FILESDIR}/zfs-init.sh.in" | \ + sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ + -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ + > "${T}/zfs-init.sh" || die +} + +src_install() { + autotools-utils_src_install + gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core + use test-suite || rm -rf "${ED}usr/share/zfs" + + newbashcomp "${FILESDIR}/bash-completion-r1" zfs + bashcomp_alias zfs zpool + + exeinto /usr/libexec + doexe "${T}/zfs-init.sh" + systemd_dounit "${T}/zfs.service" +} diff --git a/sys-fs/zfs/zfs-0.6.5.11.ebuild b/sys-fs/zfs/zfs-0.6.5.11.ebuild deleted file mode 100644 index 381dc3f9..00000000 --- a/sys-fs/zfs/zfs-0.6.5.11.ebuild +++ /dev/null @@ -1,18 +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/spl-${PV} - ~sys-fs/zfs-utils-${PV} - ~sys-kernel/zfs-dkms-${PV}" -RDEPEND="${DEPEND}" diff --git a/sys-fs/zfs/zfs-0.7.2.ebuild b/sys-fs/zfs/zfs-0.7.2.ebuild new file mode 100644 index 00000000..381dc3f9 --- /dev/null +++ b/sys-fs/zfs/zfs-0.7.2.ebuild @@ -0,0 +1,18 @@ +# 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/spl-${PV} + ~sys-fs/zfs-utils-${PV} + ~sys-kernel/zfs-dkms-${PV}" +RDEPEND="${DEPEND}" -- cgit v1.2.3