diff -Nru dkms-2.8.4/debian/bzr-builder.manifest dkms-2.8.4/debian/bzr-builder.manifest --- dkms-2.8.4/debian/bzr-builder.manifest 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/debian/bzr-builder.manifest 2020-12-29 06:52:46.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-N~17 -lp:~mmach/netext73/dkms revid:netbit73@gmail.com-20201222180107-lovz07s1k32tclet +# bzr-builder format 0.3 deb-version {debupstream}-N~21 +lp:~mmach/netext73/dkms revid:netbit73@gmail.com-20201229065153-yjltnw8kn4m6w1za diff -Nru dkms-2.8.4/debian/changelog dkms-2.8.4/debian/changelog --- dkms-2.8.4/debian/changelog 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/debian/changelog 2020-12-29 06:52:46.000000000 +0000 @@ -1,11 +1,13 @@ -dkms (2.8.4-N~17~ubuntu20.04.1) focal; urgency=low +dkms (2.8.4-N~21~ubuntu20.04.1) focal; urgency=low * Auto build. - -- NetBit73 Tue, 22 Dec 2020 18:04:08 +0000 + -- NetBit73 Tue, 29 Dec 2020 06:52:46 +0000 dkms (2.8.4-1) unstable; urgency=medium + [NetBit73] + * downgrade because of bug [ Debian Janitor ] * Fix day-of-week for changelog entry 2.0.17.5-0ubuntu1. diff -Nru dkms-2.8.4/debian/control dkms-2.8.4/debian/control --- dkms-2.8.4/debian/control 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/debian/control 2020-12-29 06:52:46.000000000 +0000 @@ -6,7 +6,7 @@ Petter Reinholdtsen , Aron Xu , Mario Limonciello -Build-Depends: debhelper-compat (= 13) +Build-Depends: debhelper-compat (= 12) Standards-Version: 4.5.0 Homepage: https://github.com/dell-oss/dkms Vcs-Git: https://salsa.debian.org/debian/dkms.git diff -Nru dkms-2.8.4/debian/patches/do-not-load-modules.patch dkms-2.8.4/debian/patches/do-not-load-modules.patch --- dkms-2.8.4/debian/patches/do-not-load-modules.patch 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/debian/patches/do-not-load-modules.patch 2020-12-29 06:52:46.000000000 +0000 @@ -12,11 +12,9 @@ dkms | 6 ------ 1 file changed, 6 deletions(-) -Index: dkms/dkms -=================================================================== ---- dkms.orig/dkms -+++ dkms/dkms -@@ -1636,12 +1636,6 @@ install_module() +--- a/dkms ++++ b/dkms +@@ -1632,12 +1632,6 @@ install_module() exit 6 } diff -Nru dkms-2.8.4/dkms dkms-2.8.4/dkms --- dkms-2.8.4/dkms 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/dkms 2020-12-29 06:52:46.000000000 +0000 @@ -210,7 +210,6 @@ [[ $(VER $kernel_test) < $(VER 2.5) ]] && module_uncompressed_suffix=".o" grep -q '\.gz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && module_compressed_suffix=".gz" grep -q '\.xz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && module_compressed_suffix=".xz" - grep -q '\.zst:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && module_compressed_suffix=".zst" module_suffix="$module_uncompressed_suffix$module_compressed_suffix" } @@ -1004,7 +1003,7 @@ etc_sysconfig_kernel_modify() ( - [[ -f /etc/sysconfig/kernel && $remake_initrd ]] || return 0 + [[ -e /etc/sysconfig/kernel && $remake_initrd ]] || return 0 # Make a temp directory to store files local temp_dir_name=$(mktemp_or_die -d $tmp_location/dkms.XXXXXX) @@ -1361,8 +1360,7 @@ [[ -e ${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix ]] && continue report_build_problem 7 \ $" Build of ${built_module_name[$count]}$module_uncompressed_suffix failed for: $kernelver ($arch)" \ - $"Make sure the name of the generated module is correct and at the root of the" \ - $"build directory, or consult make.log in the build directory" \ + $"Consult the make.log in the build directory" \ $"$dkms_tree/$module/$module_version/build/ for more information." done cd - >/dev/null @@ -1385,8 +1383,6 @@ gzip -9f "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix" elif [ "$module_compressed_suffix" = ".xz" ]; then xz -f "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix" - elif [ "$module_compressed_suffix" = ".zst" ]; then - zstd -q -f -T0 -20 --ultra "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix" fi cp -f "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_suffix" \ "$base_dir/module/${dest_module_name[$count]}$module_suffix" >/dev/null @@ -1821,7 +1817,7 @@ while [ "${dir_to_remove}" != "${dir_to_remove#/}" ]; do dir_to_remove="${dir_to_remove#/}" done - (if cd "$install_tree/$1"; then rpm -qf "${dir_to_remove}" >/dev/null 2>&1 || rmdir -p --ignore-fail-on-non-empty "${dir_to_remove}"; fi || true) + (cd "$install_tree/$1" && rmdir -p --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 @@ -3884,8 +3880,7 @@ check_root && make_driver_disk ;; build) - [ ! -w "$dkms_tree" ] && die 1 $"No write access to create a DKMS tree at ${dkms_tree}" - check_all_is_banned "build" && build_modules + check_root && check_all_is_banned "build" && build_modules ;; add) check_root && check_all_is_banned "add" && add_module diff -Nru dkms-2.8.4/dkms.8 dkms-2.8.4/dkms.8 --- dkms-2.8.4/dkms.8 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/dkms.8 2020-12-29 06:52:46.000000000 +0000 @@ -763,17 +763,6 @@ .B MODULES_CONF_OBSOLETES[#] array directive. .TP -.B NO_WEAK_MODULES= -The -.B NO_WEAK_MODULES -parameter prevents dkms from creating a symlink into the weak-updates directory, which is the -default on Red Hat derivatives. The weak modules facility was designed to eliminate the need to -rebuild kernel modules when kernel upgrades occur and relies on the symbols within the kABI. - -Fedora does not guaranteed a stable kABI so it should be disabled in the specific module override by setting it to "yes". For example, for an Nvidia DKMS module you would set the following in /etc/dkms/nvidia.conf: - -NO_WEAK_MODULES="yes" -.TP .B STRIP[#]= By default strip is considered to be "yes". If set to "no", DKMS will not run strip \-g against your built module to remove debug symbols from it. diff -Nru dkms-2.8.4/Makefile dkms-2.8.4/Makefile --- dkms-2.8.4/Makefile 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/Makefile 2020-12-29 06:52:46.000000000 +0000 @@ -38,8 +38,6 @@ install -p -m 0755 dkms $(SBIN) install -p -m 0755 dkms_autoinstaller $(LIBDIR) install -p -m 0644 dkms_framework.conf $(ETC)/framework.conf - install -p -m 0755 kernel_install.d_dkms $(ETC) - install -p -m 0755 sign_helper.sh $(ETC) install -p -m 0644 dkms_dbversion $(VAR) install -p -m 0644 dkms.bash-completion $(BASHDIR)/dkms # install compressed manpage with proper timestamp and permissions @@ -64,8 +62,6 @@ install -p -m 0644 template-dkms-mkrpm.spec $(ETC) install -p -m 0644 template-dkms-redhat-kmod.spec $(ETC) install -p -m 0755 dkms_autoinstaller $(INITD) - install -p -m 0755 kernel_install.d_dkms $(ETC) - install -p -m 0755 sign_helper.sh $(ETC) install-redhat-systemd: install doc-perms mkdir -m 0755 -p $(SYSTEMD) @@ -75,8 +71,6 @@ install -p -m 0644 template-dkms-mkrpm.spec $(ETC) install -p -m 0644 template-dkms-redhat-kmod.spec $(ETC) install -p -m 0644 dkms.service $(SYSTEMD) - install -p -m 0755 kernel_install.d_dkms $(ETC) - install -p -m 0755 sign_helper.sh $(ETC) install-doc: mkdir -m 0755 -p $(DOCDIR) @@ -98,8 +92,6 @@ install -p -m 0664 template-dkms-mkbmdeb/Makefile $(ETC)/template-dkms-mkbmdeb/ install -p -m 0664 template-dkms-mkbmdeb/debian/* $(ETC)/template-dkms-mkbmdeb/debian/ chmod +x $(ETC)/template-dkms-mkbmdeb/debian/rules - install -p -m 0755 kernel_install.d_dkms $(ETC) - install -p -m 0755 sign_helper.sh $(ETC) rm $(DOCDIR)/COPYING* rm $(DOCDIR)/sample* diff -Nru dkms-2.8.4/.pc/do-not-load-modules.patch/dkms dkms-2.8.4/.pc/do-not-load-modules.patch/dkms --- dkms-2.8.4/.pc/do-not-load-modules.patch/dkms 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/.pc/do-not-load-modules.patch/dkms 2020-12-29 06:52:46.000000000 +0000 @@ -210,7 +210,6 @@ [[ $(VER $kernel_test) < $(VER 2.5) ]] && module_uncompressed_suffix=".o" grep -q '\.gz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && module_compressed_suffix=".gz" grep -q '\.xz:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && module_compressed_suffix=".xz" - grep -q '\.zst:' /lib/modules/$kernel_test/modules.dep 2>/dev/null && module_compressed_suffix=".zst" module_suffix="$module_uncompressed_suffix$module_compressed_suffix" } @@ -1004,7 +1003,7 @@ etc_sysconfig_kernel_modify() ( - [[ -f /etc/sysconfig/kernel && $remake_initrd ]] || return 0 + [[ -e /etc/sysconfig/kernel && $remake_initrd ]] || return 0 # Make a temp directory to store files local temp_dir_name=$(mktemp_or_die -d $tmp_location/dkms.XXXXXX) @@ -1361,8 +1360,7 @@ [[ -e ${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix ]] && continue report_build_problem 7 \ $" Build of ${built_module_name[$count]}$module_uncompressed_suffix failed for: $kernelver ($arch)" \ - $"Make sure the name of the generated module is correct and at the root of the" \ - $"build directory, or consult make.log in the build directory" \ + $"Consult the make.log in the build directory" \ $"$dkms_tree/$module/$module_version/build/ for more information." done cd - >/dev/null @@ -1385,8 +1383,6 @@ gzip -9f "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix" elif [ "$module_compressed_suffix" = ".xz" ]; then xz -f "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix" - elif [ "$module_compressed_suffix" = ".zst" ]; then - zstd -q -f -T0 -20 --ultra "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_uncompressed_suffix" fi cp -f "$dkms_tree/$module/$module_version/build/${built_module_location[$count]}${built_module_name[$count]}$module_suffix" \ "$base_dir/module/${dest_module_name[$count]}$module_suffix" >/dev/null @@ -1827,7 +1823,7 @@ while [ "${dir_to_remove}" != "${dir_to_remove#/}" ]; do dir_to_remove="${dir_to_remove#/}" done - (if cd "$install_tree/$1"; then rpm -qf "${dir_to_remove}" >/dev/null 2>&1 || rmdir -p --ignore-fail-on-non-empty "${dir_to_remove}"; fi || true) + (cd "$install_tree/$1" && rmdir -p --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 @@ -3890,8 +3886,7 @@ check_root && make_driver_disk ;; build) - [ ! -w "$dkms_tree" ] && die 1 $"No write access to create a DKMS tree at ${dkms_tree}" - check_all_is_banned "build" && build_modules + check_root && check_all_is_banned "build" && build_modules ;; add) check_root && check_all_is_banned "add" && add_module diff -Nru dkms-2.8.4/test/dkms_test-1.0/dkms.conf dkms-2.8.4/test/dkms_test-1.0/dkms.conf --- dkms-2.8.4/test/dkms_test-1.0/dkms.conf 2020-12-22 18:04:08.000000000 +0000 +++ dkms-2.8.4/test/dkms_test-1.0/dkms.conf 2020-12-29 06:52:46.000000000 +0000 @@ -3,10 +3,9 @@ PACKAGE_VERSION="1.0" BUILT_MODULE_NAME="dkms_test" -# MAKE="make -C /lib/modules/${kernelver}/build SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules" -# CLEAN="make -C /lib/modules/${kernelver}/build SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build M=$PWD clean" +MAKE="make -C /lib/modules/${kernelver}/build SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules" -AUTOINSTALL="yes" +CLEAN="make -C /lib/modules/${kernelver}/build SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build M=$PWD clean" REMAKE_INITRD="yes"