Date: Tuesday, May 21, 2019 @ 14:26:27 Author: seblu Revision: 353720
upgpkg: dkms 2.7.1-1 Deleted: dkms/trunk/0002-Revert-Fix-to-run-under-BusyBox-shell.patch dkms/trunk/0003-Fix-version-check-when-installing-modules.patch ------------------------------------------------------+ 0002-Revert-Fix-to-run-under-BusyBox-shell.patch | 35 ----------------- 0003-Fix-version-check-when-installing-modules.patch | 31 --------------- 2 files changed, 66 deletions(-) Deleted: 0002-Revert-Fix-to-run-under-BusyBox-shell.patch =================================================================== --- 0002-Revert-Fix-to-run-under-BusyBox-shell.patch 2019-05-21 14:25:45 UTC (rev 353719) +++ 0002-Revert-Fix-to-run-under-BusyBox-shell.patch 2019-05-21 14:26:27 UTC (rev 353720) @@ -1,35 +0,0 @@ -From ba9057a93a47d1107836a920ed158422e9fdf9d0 Mon Sep 17 00:00:00 2001 -From: Michael Niewoehner <[email protected]> -Date: Mon, 1 Oct 2018 16:51:27 +0200 -Subject: [PATCH 2/3] Revert "Fix to run under BusyBox shell" -To: [email protected] - -This reverts commit 5da213828e2a208216f51d9ae82867bae5c040f7. - -Looks like m-emelchenkov wanted to fix the missing rmdir option -ignore-fail-on-non-empty (issue #43) but that commit made it even worse: -1. errors about deleting non-empty directories (issue #57) -2. the directories contents get deleted by "rm -rf" in any case - -This option is now implemented so revert the commit to fix the newly -introduced problems. ---- - dkms | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dkms b/dkms -index be00118..f1c1498 100644 ---- a/dkms -+++ b/dkms -@@ -1756,7 +1756,7 @@ do_uninstall() - while [ "${dir_to_remove}" != "${dir_to_remove#/}" ]; do - dir_to_remove="${dir_to_remove#/}" - done -- (cd "$install_tree/$1" && rm -rf "${dir_to_remove}/*" && rmdir -p "${dir_to_remove}" || true) -+ (cd "$install_tree/$1" && rmdir --parents --ignore-fail-on-non-empty "${dir_to_remove}" || true) - echo $" - Original module" - local origmod=$(compressed_or_uncompressed "$dkms_tree/$module/original_module/$1/$2" "${dest_module_name[$count]}") - if [[ -n "$origmod" ]]; then --- -Sébastien "Seblu" Luttringer - Deleted: 0003-Fix-version-check-when-installing-modules.patch =================================================================== --- 0003-Fix-version-check-when-installing-modules.patch 2019-05-21 14:25:45 UTC (rev 353719) +++ 0003-Fix-version-check-when-installing-modules.patch 2019-05-21 14:26:27 UTC (rev 353720) @@ -1,31 +0,0 @@ -From ffc0feec3da1c914b3c5bd72dea53d19c3beefe5 Mon Sep 17 00:00:00 2001 -From: Tony Hutter <[email protected]> -Date: Mon, 17 Sep 2018 11:39:26 -0700 -Subject: [PATCH 1/3] Fix version check when installing modules -To: [email protected] - -DKMS wasn't checking the module version when installing newer -kernel modules. This fixes the issue. - -Fixes: #14 ---- - dkms | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dkms b/dkms -index be00118..fa1ed1c 100644 ---- a/dkms -+++ b/dkms -@@ -822,7 +822,8 @@ check_version_sanity() - kernels_info[1]=${kernels_info[2]} - fi - -- if [[ ${kernels_info[1]} && ${dkms_info[1]} && ${kernels_info[1]} = ${dkms_info[1]} && ! $force ]]; then -+ if [[ ${kernels_info[1]} && ${dkms_info[1]} && ${kernels_info[1]} = ${dkms_info[1]} && -+ -n "${kernels_info[0]}" && -n "${dkms_info[0]}" && ${kernels_info[0]} = ${dkms_info[0]} && ! $force ]]; then - echo $"" >&2 - echo $"Good news! Module version $dkms_info for ${4}$module_suffix" >&2 - echo $"exactly matches what is already found in kernel $1." >&2 --- -Sébastien "Seblu" Luttringer -
