diff --git a/change-deprecated-egrep-for-grep-E.patch b/change-deprecated-egrep-for-grep-E.patch new file mode 100644 index 0000000000000000000000000000000000000000..e5c2cfc3e1cfd11cdce7355bc8d8bacf31d5816f --- /dev/null +++ b/change-deprecated-egrep-for-grep-E.patch @@ -0,0 +1,46 @@ +From 25077200289dfdc37c0e86ec4c86e4932137088e Mon Sep 17 00:00:00 2001 +From: Morten Linderud +Date: Sat, 10 Sep 2022 15:01:15 +0200 +Subject: [PATCH] dkms: Change deprecated egrep for grep -E + +New versions of grep is going to issue a warning when `egrep` is used. + + egrep: warning: egrep is obsolescent; using grep -E + +This changes the invocation to `grep -E` + +Signed-off-by: Morten Linderud +--- + dkms | 2 +- + dkms.8 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dkms b/dkms +index be00118..c4b9a26 100644 +--- a/dkms ++++ b/dkms +@@ -1900,7 +1900,7 @@ remove_module() + done + + # Delete the $module_version part of the tree if no other $module_version/$kernel_version dirs exist +- if ! find $dkms_tree/$module/$module_version/* -maxdepth 0 -type d 2>/dev/null | egrep -qv "(build|tarball|driver_disk|rpm|deb|source)$"; then ++ if ! find $dkms_tree/$module/$module_version/* -maxdepth 0 -type d 2>/dev/null | grep -Eqv "(build|tarball|driver_disk|rpm|deb|source)$"; then + echo $"" + echo $"------------------------------" + echo $"Deleting module version: $module_version" +diff --git a/dkms.8 b/dkms.8 +index 75b30de..86df63b 100644 +--- a/dkms.8 ++++ b/dkms.8 +@@ -609,7 +609,7 @@ should be put into + .B MAKE[0]. + Other entries in the MAKE array will only be used if their corresponding entry in + .B MAKE_MATCH[#] +-matches, as a regular expression (using egrep), the kernel that the module is being built for. ++matches, as a regular expression (using grep -E), the kernel that the module is being built for. + Note that if no value is placed in + .B MAKE_MATCH[#] + for any +-- +2.27.0 + diff --git a/dkms.spec b/dkms.spec index 7c5fd3a7510b663abfedabc32f775ecbee28f95c..84110958dfb2e3c5a594314512457ff5756483db 100644 --- a/dkms.spec +++ b/dkms.spec @@ -1,12 +1,13 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms Version: 2.6.1 -Release: 6 +Release: 7 License: GPLv2+ BuildArch: noarch URL: https://github.com/dell/dkms Source0: https://github.com/dell/dkms/archive/v%{version}.tar.gz#/dkms-%{version}.tar.gz # because Mandriva calls this package dkms-minimal +Patch0: change-deprecated-egrep-for-grep-E.patch Provides: dkms-minimal = %{version} Requires: coreutils Requires: cpio @@ -33,7 +34,7 @@ method for installing module RPMS as originally developed by Dell. %prep -%setup -q +%autosetup -p1 %build @@ -127,7 +128,10 @@ fi %{_sysconfdir}/bash_completion.d/%{name} %changelog -* Mon sep 7 2020 Ge Wang - 2.6.1-6 +* Mon Mar 27 2023 wangkai - 2.6.1-7 +- Change deprecated egrep for grep -E + +* Mon Sep 7 2020 Ge Wang - 2.6.1-6 - Modify the Source0 Url * Fri Feb 14 2020 Tianfei - 2.6.1-5