From fc3556aa4466d278bff2aef2f88113089def0bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Jul 2023 04:10:14 +0100 Subject: gentoo auto-resync : 05:07:2023 - 04:10:14 --- sys-fs/zfs-kmod/Manifest | 1 - sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch | 53 ------------------------ 2 files changed, 54 deletions(-) delete mode 100644 sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch (limited to 'sys-fs/zfs-kmod') diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index ca797f6464b4..8f993cd9f8b4 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,5 +1,4 @@ AUX zfs-kmod-2.1.11-gentoo.patch 1076 BLAKE2B d2b0fe2ff1ac31c2a2a184141f107010dae61d2de465462b8177db1a07918be2bd2fc4d4570ad8758da87ef14cf3878db062fe9eb5b53fa3156e7db5c06073d4 SHA512 9e103aae75036e52f89e79c4d4ed3cffe670ef423cda7c2f936533b9329e994c7a02d241289f6565e9d086e5b0bdd6865ab3677c3ad84eaadf3abe310977b6a8 -AUX zfs-kmod-2.1.6-fgrep.patch 2183 BLAKE2B b8c9b58cc6d94e9ddeacbe3c5eca9d040f1c6fba84b814c8c553d5c1e15334765d3190286a4ad2298762bc54f66a8b89ef69d115cfbd5a25d928170a1d46a770 SHA512 f65e7ffa8cfd00da7ad6d1fcbf5d61172c52e55ea2630f719b49750692c1c046e8baed0e04cadc841adbd804cf861ec712b0d07dbbcae7c1c3b475326045ae8c DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 991ac2347bcd452812e247358e2c44a04a88e700d25878b5b95f86939e6114e1205e7afabfd2a1ea9220947876511374d7224aa587d3d66184838d705f71a89a SHA512 335a543644d2dbba919213a28cc5922bf6a118fc19069db84562ce056449a2d6ca4ba827e54f304ab7d9be22260aa9b255134f1b12e2bc98890f757f35e48bd7 DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01 SHA512 7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41 DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 652780e6bf7b63f45909110726d53795fada034f6044c8393fa3980e30217ada6931e3c2bb57210719e3c78c16f973f69287b7e2b475601f4ce12d701d9d96ae SHA512 f48493a21883e441cda705fb085353bed033f1620a1d0f93069c345c76cf2c0759a2e6f7a80c47c9398e9878abfe1d90d931fe5ceaf2588770a71491a434631e diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.6-fgrep.patch deleted file mode 100644 index 2e47c5bcc093..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-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?= -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 -Reviewed-by: John Kennedy -Reviewed-by: Ryan Moeller -Signed-off-by: Ahelenia Ziemiańska -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' - } - -- cgit v1.2.3