commit: 26b76d6d9b171919b3988cf9f1131941c4ffc336 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Jul 4 09:57:12 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Jul 4 22:16:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b76d6d
sys-fs/zfs: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31736 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> sys-fs/zfs/files/2.1.6-fgrep.patch | 53 ---------------------- .../2.1.7-dracut-include-systemd-overrides.patch | 44 ------------------ .../files/2.1.7-systemd-zed-restart-always.patch | 27 ----------- 3 files changed, 124 deletions(-) diff --git a/sys-fs/zfs/files/2.1.6-fgrep.patch b/sys-fs/zfs/files/2.1.6-fgrep.patch deleted file mode 100644 index 2e47c5bcc093..000000000000 --- a/sys-fs/zfs/files/2.1.6-fgrep.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/openzfs/zfs/commit/d30577c9dd811688f2609ad532b011b99bceb485 - -From d30577c9dd811688f2609ad532b011b99bceb485 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz> -Date: Sat, 12 Mar 2022 00:26:46 +0100 -Subject: [PATCH] fgrep -> grep -F -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Reviewed-by: Brian Behlendorf <behlendo...@llnl.gov> -Reviewed-by: John Kennedy <john.kenn...@delphix.com> -Reviewed-by: Ryan Moeller <r...@ixsystems.com> -Signed-off-by: Ahelenia Ziemiańska <nabijaczlew...@nabijaczleweli.xyz> -Closes #13259 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -394,11 +394,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [ - utsrelease1=$kernelbuild/include/linux/version.h - utsrelease2=$kernelbuild/include/linux/utsrelease.h - utsrelease3=$kernelbuild/include/generated/utsrelease.h -- AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [ -+ AS_IF([test -r $utsrelease1 && grep -qF UTS_RELEASE $utsrelease1], [ - utsrelease=$utsrelease1 -- ], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [ -+ ], [test -r $utsrelease2 && grep -qF UTS_RELEASE $utsrelease2], [ - utsrelease=$utsrelease2 -- ], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [ -+ ], [test -r $utsrelease3 && grep -qF UTS_RELEASE $utsrelease3], [ - utsrelease=$utsrelease3 - ]) - ---- a/config/zfs-build.m4 -+++ b/config/zfs-build.m4 -@@ -173,7 +173,7 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [ - ]) - - AC_DEFUN([ZFS_AC_DEBUG_INVARIANTS_DETECT_FREEBSD], [ -- AS_IF([sysctl -n kern.conftxt | fgrep -qx $'options\tINVARIANTS'], -+ AS_IF([sysctl -n kern.conftxt | grep -Fqx $'options\tINVARIANTS'], - [enable_invariants="yes"], - [enable_invariants="no"]) - ]) ---- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib -+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib -@@ -120,5 +120,5 @@ function check_while_waiting - # Whether any vdev in the given pool is initializing - function is_vdev_initializing # pool - { -- zpool status -i "$1" | grep 'initialized, started' >/dev/null -+ zpool status -i "$1" | grep -q 'initialized, started' - } - diff --git a/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch b/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch deleted file mode 100644 index 2a50dc658876..000000000000 --- a/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b10f73f78eb223dd799a87474c537a69113edee1 Mon Sep 17 00:00:00 2001 -From: Vince van Oosten <techhaz...@codeforyouand.me> -Date: Sun, 23 Oct 2022 10:55:46 +0200 -Subject: [PATCH] include systemd overrides to zfs-dracut module - -If a user that uses systemd and dracut wants to overide certain -settings, they typically use `systemctl edit [unit]` or place a file in -`/etc/systemd/system/[unit].d/override.conf` directly. - -The zfs-dracut module did not include those overrides however, so this -did not have any effect at boot time. - -For zfs-import-scan.service and zfs-import-cache.service, overrides are -now included in the dracut initramfs image. - -Reviewed-by: Brian Behlendorf <behlendo...@llnl.gov> -Signed-off-by: Vince van Oosten <techhaz...@codeforyouand.me> -Closes #14075 -Closes #14076 ---- - contrib/dracut/90zfs/module-setup.sh.in | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in -index 81d7d2abe49..b16529de905 100755 ---- a/contrib/dracut/90zfs/module-setup.sh.in -+++ b/contrib/dracut/90zfs/module-setup.sh.in -@@ -86,6 +86,16 @@ install() { - "zfs-import-cache.service"; do - inst_simple "${systemdsystemunitdir}/${_service}" - systemctl -q --root "${initdir}" add-wants zfs-import.target "${_service}" -+ -+ # Add user-provided unit overrides -+ # - /etc/systemd/system/zfs-import-{scan,cache}.service -+ # - /etc/systemd/system/zfs-import-{scan,cache}.service.d/overrides.conf -+ # -H ensures they are marked host-only -+ # -o ensures there is no error upon absence of these files -+ inst_multiple -o -H \ -+ "${systemdsystemconfdir}/${_service}" \ -+ "${systemdsystemconfdir}/${_service}.d/"*.conf -+ - done - - for _service in \ diff --git a/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch b/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch deleted file mode 100644 index 2d4b92d5c66a..000000000000 --- a/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f505cd53fd9cb6e6efb1e23a9d77e38bba754695 Mon Sep 17 00:00:00 2001 -From: George Melikov <m...@gmelikov.ru> -Date: Fri, 16 Dec 2022 01:11:02 +0300 -Subject: [PATCH] systemd: set restart=always for zfs-zed.service -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: George Melikov <m...@gmelikov.ru> -Co-authored-by: Attila Fülöp <att...@fueloep.org> ---- - etc/systemd/system/zfs-zed.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in -index 73a83e59e51..be2fc67348f 100644 ---- a/etc/systemd/system/zfs-zed.service.in -+++ b/etc/systemd/system/zfs-zed.service.in -@@ -6,7 +6,7 @@ ConditionPathIsDirectory=/sys/module/zfs - [Service] - EnvironmentFile=-@initconfdir@/zfs - ExecStart=@sbindir@/zed -F --Restart=on-abort -+Restart=always - - [Install] - Alias=zed.service
