sys-fs/zfs : version bump

10 files changed, 25 insertions, 68 deletions

diff --git a/metadata/md5-cache/sys-fs/zfs-2.2.1 b/metadata/md5-cache/sys-fs/zfs-2.2.2
index c483edd8..76c245f8 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.2.1
+++ b/metadata/md5-cache/sys-fs/zfs-2.2.2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DEPEND=~sys-fs/zfs-utils-2.2.1 ~sys-kernel/zfs-dkms-2.2.1
+DEPEND=~sys-fs/zfs-utils-2.2.2 ~sys-kernel/zfs-dkms-2.2.2
 DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild)
 EAPI=7
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=~sys-fs/zfs-utils-2.2.1 ~sys-kernel/zfs-dkms-2.2.1
+RDEPEND=~sys-fs/zfs-utils-2.2.2 ~sys-kernel/zfs-dkms-2.2.2
 SLOT=0
 _md5_=e55b835fd30a4e79085053c624251ca7
diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.2.1 b/metadata/md5-cache/sys-fs/zfs-utils-2.2.2
index c05c46ae..3bf0a8bd 100644
--- a/metadata/md5-cache/sys-fs/zfs-utils-2.2.1
+++ b/metadata/md5-cache/sys-fs/zfs-utils-2.2.2
@@ -11,6 +11,6 @@ LICENSE=BSD-2 CDDL MIT
 RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) 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.1/zfs-2.2.1.tar.gz
+SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.2.2/zfs-2.2.2.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=d57fd45904d9765be3b700129afcec01
diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.1 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.2-r2
index 0cfdab78..9e5be43a 100644
--- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.1
+++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.2-r2
@@ -8,6 +8,6 @@ KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=sys-kernel/dkms
 SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.1/zfs-2.2.1.tar.gz
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.2/zfs-2.2.2.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b228ff92d78e17fa11b967d26a68b4f5
+_md5_=46c7d1966fb8f66020972811b725e0c7
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index c94a82cd..52e35ad9 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -57,8 +57,8 @@ sys-devel/gcc 13.2.0-r10: 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 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
-sys-fs/zfs 2.2.1: ZFS meta-package (Gentoo compatibility ebuild)
-sys-fs/zfs-utils 2.2.1: Userland utilities for ZFS Linux kernel module
+sys-fs/zfs 2.2.2: ZFS meta-package (Gentoo compatibility ebuild)
+sys-fs/zfs-utils 2.2.2: Userland utilities for ZFS Linux kernel module
 sys-kernel/bcmwl-dkms 6.30.223.271-r6: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
 sys-kernel/dkms 2.3-r3: Dynamic Kernel Module Support
 sys-kernel/dracut 056-r10: Generic initramfs generation tool
@@ -69,7 +69,7 @@ sys-kernel/linux-sources-redcore-lts 5.10.204 5.15.143 6.1.68 6.6.7: Redcore Lin
 sys-kernel/nvidia-drivers-dkms 390.157-r6 470.223.02 535.129.03: NVIDIA driver sources for linux
 sys-kernel/vhba-dkms 20211218-r5: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
 sys-kernel/virtualbox-modules-dkms 7.0.12: Kernel Modules source for Virtualbox
-sys-kernel/zfs-dkms 2.2.1: ZFS sources for linux
+sys-kernel/zfs-dkms 2.2.2-r2: 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 ed585cac..1bbb3796 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6 SHA512 05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
+DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866 SHA512 bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
diff --git a/sys-fs/zfs-utils/zfs-utils-2.2.1.ebuild b/sys-fs/zfs-utils/zfs-utils-2.2.2.ebuild
index 0545a209..0545a209 100644
--- a/sys-fs/zfs-utils/zfs-utils-2.2.1.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-2.2.2.ebuild
diff --git a/sys-fs/zfs/zfs-2.2.1.ebuild b/sys-fs/zfs/zfs-2.2.2.ebuild
index bdcb914c..bdcb914c 100644
--- a/sys-fs/zfs/zfs-2.2.1.ebuild
+++ b/sys-fs/zfs/zfs-2.2.2.ebuild
diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest
index ed585cac..1bbb3796 100644
--- a/sys-kernel/zfs-dkms/Manifest
+++ b/sys-kernel/zfs-dkms/Manifest
@@ -1 +1 @@
-DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6 SHA512 05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
+DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866 SHA512 bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf
index 63714364..c4013881 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.1"
+PACKAGE_VERSION="2.2.2"
 PACKAGE_CONFIG="/etc/sysconfig/zfs"
 NO_WEAK_MODULES="yes"
 BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-6]\.)" # only build for kernels v5.x.x up to and including v6.6.x
@@ -7,22 +7,14 @@ PRE_BUILD="configure
   --prefix=/usr
   --with-config=kernel
   --with-linux=$(
-    case `lsb_release -is` in
-      (Debian|Devuan)
-        if [[ -e ${kernel_source_dir/%build/source} ]]
-        then
-          echo ${kernel_source_dir/%build/source}
-        else
-          # A kpkg exception for Proxmox 2.0
-          echo ${kernel_source_dir}
-        fi
-      ;;
-      (*)
-        echo ${kernel_source_dir}
-      ;;
-    esac
+    if [ -e "${kernel_source_dir/%build/source}" ]
+    then
+      echo "${kernel_source_dir/%build/source}"
+    else
+      echo "${kernel_source_dir}"
+    fi
   )
-  --with-linux-obj=${kernel_source_dir}
+  --with-linux-obj="${kernel_source_dir}"
   $(
     [[ -n \"${ICP_ROOT}\" ]] && \
     {
@@ -54,7 +46,6 @@ POST_BUILD="scripts/dkms.postbuild
   -t ${dkms_tree}
 "
 AUTOINSTALL="yes"
-REMAKE_INITRD="no"
 MAKE[0]="make"
 STRIP[0]="$(
   [[ -r ${PACKAGE_CONFIG} ]] \
@@ -64,37 +55,9 @@ STRIP[0]="$(
   && echo -n no
 )"
 STRIP[1]="${STRIP[0]}"
-STRIP[2]="${STRIP[0]}"
-STRIP[3]="${STRIP[0]}"
-STRIP[4]="${STRIP[0]}"
-STRIP[5]="${STRIP[0]}"
-STRIP[6]="${STRIP[0]}"
-STRIP[7]="${STRIP[0]}"
-STRIP[8]="${STRIP[0]}"
-BUILT_MODULE_NAME[0]="zavl"
-BUILT_MODULE_LOCATION[0]="module/avl/"
+BUILT_MODULE_NAME[0]="zfs"
+BUILT_MODULE_LOCATION[0]="module/"
 DEST_MODULE_LOCATION[0]="/extra/dkms"
-BUILT_MODULE_NAME[1]="znvpair"
-BUILT_MODULE_LOCATION[1]="module/nvpair/"
+BUILT_MODULE_NAME[1]="spl"
+BUILT_MODULE_LOCATION[1]="module/"
 DEST_MODULE_LOCATION[1]="/extra/dkms"
-BUILT_MODULE_NAME[2]="zunicode"
-BUILT_MODULE_LOCATION[2]="module/unicode/"
-DEST_MODULE_LOCATION[2]="/extra/dkms"
-BUILT_MODULE_NAME[3]="zcommon"
-BUILT_MODULE_LOCATION[3]="module/zcommon/"
-DEST_MODULE_LOCATION[3]="/extra/dkms"
-BUILT_MODULE_NAME[4]="zfs"
-BUILT_MODULE_LOCATION[4]="module/zfs/"
-DEST_MODULE_LOCATION[4]="/extra/dkms"
-BUILT_MODULE_NAME[5]="icp"
-BUILT_MODULE_LOCATION[5]="module/icp/"
-DEST_MODULE_LOCATION[5]="/extra/dkms"
-BUILT_MODULE_NAME[6]="zlua"
-BUILT_MODULE_LOCATION[6]="module/lua/"
-DEST_MODULE_LOCATION[6]="/extra/dkms"
-BUILT_MODULE_NAME[7]="spl"
-BUILT_MODULE_LOCATION[7]="module/spl/"
-DEST_MODULE_LOCATION[7]="/extra/dkms"
-BUILT_MODULE_NAME[8]="zzstd"
-BUILT_MODULE_LOCATION[8]="module/zstd/"
-DEST_MODULE_LOCATION[8]="/extra/dkms"
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.2.1.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.2.2-r2.ebuild
index 3caa2acb..11dda2c1 100644
--- a/sys-kernel/zfs-dkms/zfs-dkms-2.2.1.ebuild
+++ b/sys-kernel/zfs-dkms/zfs-dkms-2.2.2-r2.ebuild
@@ -31,15 +31,9 @@ src_compile() {
 }
 
 src_install() {
-	cp "${FILESDIR}/dkms.conf" "${S}" || die
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
-	doins -r ${S}/*
-	fperms 0755 /usr/src/${P}/configure
-	fperms 0755 /usr/src/${P}/scripts/dkms.mkconf
-	fperms 0755 /usr/src/${P}/scripts/dkms.postbuild
-	fperms 0755 /usr/src/${P}/scripts/enum-extract.pl
-	fperms 0755 /usr/src/${P}/scripts/make_gitrev.sh
+	dodir usr/src/"${P}"
+	cp -ax "${FILESDIR}"/dkms.conf "${S}" || die
+	cp -ax "${S}"/* "${D}"usr/src/"${P}" || die
 }
 
 pkg_postinst() {