From 503ea5165eeebc882f155cb259d29d287e41b54e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Jan 2025 12:05:13 +0000 Subject: sys-fs/zfs : version bump --- metadata/md5-cache/sys-fs/zfs-2.2.7 | 9 --- metadata/md5-cache/sys-fs/zfs-2.3.0 | 9 +++ metadata/md5-cache/sys-fs/zfs-utils-2.2.7 | 16 ---- metadata/md5-cache/sys-fs/zfs-utils-2.3.0 | 16 ++++ metadata/md5-cache/sys-kernel/zfs-dkms-2.2.7 | 11 --- metadata/md5-cache/sys-kernel/zfs-dkms-2.3.0 | 11 +++ metadata/pkg_desc_index | 6 +- sys-fs/zfs-utils/Manifest | 2 +- sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch | 39 --------- sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild | 112 -------------------------- sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild | 111 +++++++++++++++++++++++++ sys-fs/zfs/zfs-2.2.7.ebuild | 17 ---- sys-fs/zfs/zfs-2.3.0.ebuild | 17 ++++ sys-kernel/zfs-dkms/Manifest | 2 +- sys-kernel/zfs-dkms/files/dkms.conf | 2 +- sys-kernel/zfs-dkms/zfs-dkms-2.2.7.ebuild | 43 ---------- sys-kernel/zfs-dkms/zfs-dkms-2.3.0.ebuild | 43 ++++++++++ 17 files changed, 213 insertions(+), 253 deletions(-) delete mode 100644 metadata/md5-cache/sys-fs/zfs-2.2.7 create mode 100644 metadata/md5-cache/sys-fs/zfs-2.3.0 delete mode 100644 metadata/md5-cache/sys-fs/zfs-utils-2.2.7 create mode 100644 metadata/md5-cache/sys-fs/zfs-utils-2.3.0 delete mode 100644 metadata/md5-cache/sys-kernel/zfs-dkms-2.2.7 create mode 100644 metadata/md5-cache/sys-kernel/zfs-dkms-2.3.0 delete mode 100644 sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch delete mode 100644 sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild create mode 100644 sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild delete mode 100644 sys-fs/zfs/zfs-2.2.7.ebuild create mode 100644 sys-fs/zfs/zfs-2.3.0.ebuild delete mode 100644 sys-kernel/zfs-dkms/zfs-dkms-2.2.7.ebuild create mode 100644 sys-kernel/zfs-dkms/zfs-dkms-2.3.0.ebuild diff --git a/metadata/md5-cache/sys-fs/zfs-2.2.7 b/metadata/md5-cache/sys-fs/zfs-2.2.7 deleted file mode 100644 index daeeb7b3..00000000 --- a/metadata/md5-cache/sys-fs/zfs-2.2.7 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=- -DEPEND=~sys-fs/zfs-utils-2.2.7 ~sys-kernel/zfs-dkms-2.2.7 -DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild) -EAPI=7 -KEYWORDS=amd64 -LICENSE=GPL-2 -RDEPEND=~sys-fs/zfs-utils-2.2.7 ~sys-kernel/zfs-dkms-2.2.7 -SLOT=0 -_md5_=e55b835fd30a4e79085053c624251ca7 diff --git a/metadata/md5-cache/sys-fs/zfs-2.3.0 b/metadata/md5-cache/sys-fs/zfs-2.3.0 new file mode 100644 index 00000000..8d87eaf3 --- /dev/null +++ b/metadata/md5-cache/sys-fs/zfs-2.3.0 @@ -0,0 +1,9 @@ +DEFINED_PHASES=- +DEPEND=~sys-fs/zfs-utils-2.3.0 ~sys-kernel/zfs-dkms-2.3.0 +DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild) +EAPI=7 +KEYWORDS=amd64 +LICENSE=GPL-2 +RDEPEND=~sys-fs/zfs-utils-2.3.0 ~sys-kernel/zfs-dkms-2.3.0 +SLOT=0 +_md5_=e55b835fd30a4e79085053c624251ca7 diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.2.7 b/metadata/md5-cache/sys-fs/zfs-utils-2.2.7 deleted file mode 100644 index e01e4db5..00000000 --- a/metadata/md5-cache/sys-fs/zfs-utils-2.2.7 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig -DEFINED_PHASES=configure install prepare -DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:= pam? ( sys-libs/pam ) unwind? ( sys-libs/libunwind:= ) -DESCRIPTION=Userland utilities for ZFS Linux kernel module -EAPI=7 -HOMEPAGE=https://zfsonlinux.org/ -INHERIT=autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript -IUSE=debug nls pam test-suite unwind split-usr -KEYWORDS=~amd64 -LICENSE=BSD-2 CDDL MIT -RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:= pam? ( sys-libs/pam ) unwind? ( sys-libs/libunwind:= ) app-alternatives/awk virtual/udev sys-fs/udev-init-scripts test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) -RESTRICT=test -SLOT=0 -SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.2.7/zfs-2.2.7.tar.gz -_eclasses_=autotools 7d91cc798a8afd8f4e0c6e9587296ebe bash-completion-r1 767861f3744f589ee5291c1698b1c082 flag-o-matic f14aba975c94ccaa9f357a27e3b17ffe gnuconfig ddeb9f8caff1b5f71a09c75b7534df79 libtool 6b28392a775f807c8be5fc7ec9a605b9 multilib b2a329026f2e404e9e371097dda47f96 pam b56d0c9c20fc5b553f13c8ae165a10a5 toolchain-funcs 14648d8795f7779e11e1bc7cf08b7536 udev f3d9a4376ebd22131726a68e1a0a058f usr-ldscript ff03a5d223e97515fa25b5cae97ebda9 -_md5_=3f5136e6a091af53b0864f79c9f80a60 diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.3.0 b/metadata/md5-cache/sys-fs/zfs-utils-2.3.0 new file mode 100644 index 00000000..8aced4e4 --- /dev/null +++ b/metadata/md5-cache/sys-fs/zfs-utils-2.3.0 @@ -0,0 +1,16 @@ +BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig +DEFINED_PHASES=configure install prepare +DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:= pam? ( sys-libs/pam ) unwind? ( sys-libs/libunwind:= ) +DESCRIPTION=Userland utilities for ZFS Linux kernel module +EAPI=7 +HOMEPAGE=https://zfsonlinux.org/ +INHERIT=autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript +IUSE=debug nls pam test-suite unwind split-usr +KEYWORDS=~amd64 +LICENSE=BSD-2 CDDL MIT +RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:= pam? ( sys-libs/pam ) unwind? ( sys-libs/libunwind:= ) app-alternatives/awk virtual/udev sys-fs/udev-init-scripts test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) +RESTRICT=test +SLOT=0 +SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.3.0/zfs-2.3.0.tar.gz +_eclasses_=autotools 7d91cc798a8afd8f4e0c6e9587296ebe bash-completion-r1 767861f3744f589ee5291c1698b1c082 flag-o-matic f14aba975c94ccaa9f357a27e3b17ffe gnuconfig ddeb9f8caff1b5f71a09c75b7534df79 libtool 6b28392a775f807c8be5fc7ec9a605b9 multilib b2a329026f2e404e9e371097dda47f96 pam b56d0c9c20fc5b553f13c8ae165a10a5 toolchain-funcs 14648d8795f7779e11e1bc7cf08b7536 udev f3d9a4376ebd22131726a68e1a0a058f usr-ldscript ff03a5d223e97515fa25b5cae97ebda9 +_md5_=8bcd4dffeec9930c4dda3265f34c2cf8 diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.7 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.7 deleted file mode 100644 index 97230b21..00000000 --- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.7 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prerm -DEPEND=sys-kernel/dkms -DESCRIPTION=ZFS sources for linux -EAPI=8 -HOMEPAGE=http://zfsonlinux.org/ -KEYWORDS=amd64 -LICENSE=GPL-2 -RDEPEND=sys-kernel/dkms -SLOT=0 -SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.7/zfs-2.2.7.tar.gz -_md5_=8dab2841d2ca48635d73941d7dabcd9c diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.3.0 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.3.0 new file mode 100644 index 00000000..89d7decf --- /dev/null +++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.3.0 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install postinst prerm +DEPEND=sys-kernel/dkms +DESCRIPTION=ZFS sources for linux +EAPI=8 +HOMEPAGE=http://zfsonlinux.org/ +KEYWORDS=amd64 +LICENSE=GPL-2 +RDEPEND=sys-kernel/dkms +SLOT=0 +SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.3.0/zfs-2.3.0.tar.gz +_md5_=8dab2841d2ca48635d73941d7dabcd9c diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index b3893e35..b5174390 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -62,8 +62,8 @@ sys-devel/gcc 13.2.1_p20240210-r5: The GNU Compiler Collection sys-fs/cryptsetup 2.6.1-r5: Tool to setup encrypted devices with dm-crypt sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go sys-fs/vhba 20240917: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite -sys-fs/zfs 2.2.7: ZFS meta-package (Gentoo compatibility ebuild) -sys-fs/zfs-utils 2.2.7: Userland utilities for ZFS Linux kernel module +sys-fs/zfs 2.3.0: ZFS meta-package (Gentoo compatibility ebuild) +sys-fs/zfs-utils 2.3.0: Userland utilities for ZFS Linux kernel module sys-kernel/bcmwl-dkms 6.30.223.271-r14: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source sys-kernel/dkms 2.3-r4: Dynamic Kernel Module Support sys-kernel/dracut 059-r15: Generic initramfs generation tool @@ -75,7 +75,7 @@ sys-kernel/nvidia-drivers-dkms 390.157-r8 470.256.02 550.142: NVIDIA driver sour sys-kernel/tp_smapi-dkms 0.44-r4: IBM ThinkPad SMAPI BIOS driver sources sys-kernel/vhba-dkms 20240917-r1: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources sys-kernel/virtualbox-modules-dkms 7.1.4-r2: Kernel Modules source for Virtualbox -sys-kernel/zfs-dkms 2.2.7: ZFS sources for linux +sys-kernel/zfs-dkms 2.3.0: ZFS sources for linux sys-power/radeon-profile 20200824-r10: Read current clocks of ATi/AMD Radeon cards virtual/libudev 314.1337-r1: Virtual for libudev providers virtual/linux-sources 314.1337-r1: Virtual for Linux kernel sources diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest index 31a404de..cb4f42d9 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271 +DIST zfs-2.3.0.tar.gz 34029599 BLAKE2B b9fb7913f95dd0c8aec703961ecc0413aa51df889f15b1541ff8fcd7146ba485947fab83deb062bdffcdeab17a2465b7551c7eba3ec55c62c21aba58846c0da5 SHA512 f0bb1c6e28b325765be809dbc5d38ba294daa38b54eafd7d129cf6081fb209b200580437019faeed3614bbb0687d6583698a9282f3275905a1f5a8314a66cf0b diff --git a/sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch b/sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch deleted file mode 100644 index b132db9d..00000000 --- a/sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/openzfs/zfs/issues/15241 -https://github.com/openzfs/zfs/pull/15560 - -From e0a7ec29d91b79adfd81073f229241351ed0ae21 Mon Sep 17 00:00:00 2001 -From: Ilkka Sovanto -Date: Wed, 22 Nov 2023 20:24:47 +0200 -Subject: [PATCH] Fix zoneid when USER_NS is disabled - -getzoneid() should return GLOBAL_ZONEID instead of 0 when USER_NS is disabled. - -Signed-off-by: Ilkka Sovanto ---- a/lib/libspl/os/linux/zone.c -+++ b/lib/libspl/os/linux/zone.c -@@ -42,20 +42,20 @@ getzoneid(void) - int c = snprintf(path, sizeof (path), "/proc/self/ns/user"); - /* This API doesn't have any error checking... */ - if (c < 0 || c >= sizeof (path)) -- return (0); -+ return (GLOBAL_ZONEID); - - ssize_t r = readlink(path, buf, sizeof (buf) - 1); - if (r < 0) -- return (0); -+ return (GLOBAL_ZONEID); - - cp = strchr(buf, '['); - if (cp == NULL) -- return (0); -+ return (GLOBAL_ZONEID); - cp++; - - unsigned long n = strtoul(cp, NULL, 10); - if (n == ULONG_MAX && errno == ERANGE) -- return (0); -+ return (GLOBAL_ZONEID); - zoneid_t z = (zoneid_t)n; - - return (z); - diff --git a/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild b/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild deleted file mode 100644 index 2ef8e142..00000000 --- a/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript - -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/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" -KEYWORDS="~amd64" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="debug nls pam test-suite unwind" - -DEPEND=" - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/libudev:= - dev-libs/openssl:= - pam? ( sys-libs/pam ) - unwind? ( sys-libs/libunwind:= ) -" - -BDEPEND="app-alternatives/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -RDEPEND="${DEPEND} - app-alternatives/awk - virtual/udev - sys-fs/udev-init-scripts - test-suite? ( - sys-apps/kmod[tools] - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch - "${FILESDIR}"/2.2.2-no-USER_NS.patch -) - -src_prepare() { - default - - # Run unconditionally (bug #792627) - eautoreconf - - # Tries to use /etc/conf.d which we reserve for OpenRC - sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - local myconf=( - --bindir="${EPREFIX}/bin" - --enable-shared - --disable-systemd - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir="${EPREFIX}/unwanted_files" - --with-pammoduledir="$(getpam_mod_dir)" - --with-vendor=redcore - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - $(use_with unwind libunwind) - --disable-pyzfs - --disable-static - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - dodir etc/conf.d - insinto etc/conf.d - doins "${S}"/etc/default/zfs - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs -} diff --git a/sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild b/sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild new file mode 100644 index 00000000..ab207679 --- /dev/null +++ b/sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript + +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/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" +KEYWORDS="~amd64" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD-2 CDDL MIT" +SLOT="0" +IUSE="debug nls pam test-suite unwind" + +DEPEND=" + net-libs/libtirpc:= + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + dev-libs/openssl:= + pam? ( sys-libs/pam ) + unwind? ( sys-libs/libunwind:= ) +" + +BDEPEND="app-alternatives/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +RDEPEND="${DEPEND} + app-alternatives/awk + virtual/udev + sys-fs/udev-init-scripts + test-suite? ( + sys-apps/kmod[tools] + sys-apps/util-linux + sys-devel/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch +) + +src_prepare() { + default + + # Run unconditionally (bug #792627) + eautoreconf + + # Tries to use /etc/conf.d which we reserve for OpenRC + sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --disable-systemd + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-vendor=redcore + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + $(use_with unwind libunwind) + --disable-pyzfs + --disable-static + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + dodir etc/conf.d + insinto etc/conf.d + doins "${S}"/etc/default/zfs + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs +} diff --git a/sys-fs/zfs/zfs-2.2.7.ebuild b/sys-fs/zfs/zfs-2.2.7.ebuild deleted file mode 100644 index bdcb914c..00000000 --- a/sys-fs/zfs/zfs-2.2.7.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=7 - -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-2.3.0.ebuild b/sys-fs/zfs/zfs-2.3.0.ebuild new file mode 100644 index 00000000..bdcb914c --- /dev/null +++ b/sys-fs/zfs/zfs-2.3.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=7 + +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-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest index 31a404de..cb4f42d9 100644 --- a/sys-kernel/zfs-dkms/Manifest +++ b/sys-kernel/zfs-dkms/Manifest @@ -1 +1 @@ -DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271 +DIST zfs-2.3.0.tar.gz 34029599 BLAKE2B b9fb7913f95dd0c8aec703961ecc0413aa51df889f15b1541ff8fcd7146ba485947fab83deb062bdffcdeab17a2465b7551c7eba3ec55c62c21aba58846c0da5 SHA512 f0bb1c6e28b325765be809dbc5d38ba294daa38b54eafd7d129cf6081fb209b200580437019faeed3614bbb0687d6583698a9282f3275905a1f5a8314a66cf0b diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf index aaf7a576..f468d99f 100644 --- a/sys-kernel/zfs-dkms/files/dkms.conf +++ b/sys-kernel/zfs-dkms/files/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="zfs-dkms" -PACKAGE_VERSION="2.2.7" +PACKAGE_VERSION="2.3.0" PACKAGE_CONFIG="/etc/sysconfig/zfs" NO_WEAK_MODULES="yes" BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-9]\.|\.|6\.1[0-2]\.)" # only build for kernels v5.x.x up to and including v6.12.x diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.2.7.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.2.7.ebuild deleted file mode 100644 index ac8c3303..00000000 --- a/sys-kernel/zfs-dkms/zfs-dkms-2.2.7.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=8 - -MY_PN="zfs" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="ZFS sources for linux" -HOMEPAGE="http://zfsonlinux.org/" -SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64" -IUSE="" -DEPEND="sys-kernel/dkms" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - dodir usr/src/"${P}" - cp -ax "${FILESDIR}"/dkms.conf "${S}" || die - cp -ax "${S}"/* "${D}"/usr/src/"${P}" || die -} - -pkg_postinst() { - dkms add ${PN}/${PV} -} - -pkg_prerm() { - dkms remove ${PN}/${PV} --all -} diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.3.0.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.3.0.ebuild new file mode 100644 index 00000000..ac8c3303 --- /dev/null +++ b/sys-kernel/zfs-dkms/zfs-dkms-2.3.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=8 + +MY_PN="zfs" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="ZFS sources for linux" +HOMEPAGE="http://zfsonlinux.org/" +SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64" +IUSE="" +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + : +} + +src_compile() { + : +} + +src_install() { + dodir usr/src/"${P}" + cp -ax "${FILESDIR}"/dkms.conf "${S}" || die + cp -ax "${S}"/* "${D}"/usr/src/"${P}" || die +} + +pkg_postinst() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} -- cgit v1.2.3