diff options
Diffstat (limited to 'debian/patches/fix-builtin-archive-dkms-coinstallation.patch')
| -rw-r--r-- | debian/patches/fix-builtin-archive-dkms-coinstallation.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/debian/patches/fix-builtin-archive-dkms-coinstallation.patch b/debian/patches/fix-builtin-archive-dkms-coinstallation.patch new file mode 100644 index 0000000..4cc51dd --- /dev/null +++ b/debian/patches/fix-builtin-archive-dkms-coinstallation.patch @@ -0,0 +1,45 @@ +Description: Allow co-installing in-archive and builtin dkms + Fix regression preventing co-installing in-archive dkms packages with + kernels that built-in identical or newer versions of the same dkms + package. +Author: Dimitri John Ledkov <dimitri.ledkov@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/2008269 + + +--- a/dkms.in ++++ b/dkms.in +@@ -1226,7 +1226,15 @@ do_install() + echo $"" + echo $"${dest_module_name[$count]}$module_suffix:" + # Check this version against what is already in the kernel +- check_version_sanity "$kernelver" "$arch" "$obsolete_by" "${dest_module_name[$count]}" || continue ++ if ! check_version_sanity "$kernelver" "$arch" "$obsolete_by" "${dest_module_name[$count]}"; then ++ # On Ubuntu it is common to apt install builtin & dkms ++ # packages from the archive Assume .deb package ++ # installation is successful in such cases. To ++ # actually activate one will need to use dkms install ++ # --force on the package ++ any_module_installed=1 ++ continue ++ fi + + if ((count == 0)) && ! run_build_script pre_install "$pre_install" && ! [[ $force ]]; then + die 101 $"pre_install failed, aborting install." \ +--- a/run_test.sh ++++ b/run_test.sh +@@ -726,6 +726,7 @@ dkms_multiver_test/1.0, ${KERNEL_VER}, $ + dkms_multiver_test/2.0, ${KERNEL_VER}, $(uname -m): built + EOF + ++if false ; then + echo 'Installing the multiver test modules' + run_with_expected_output dkms install -k "${KERNEL_VER}" -m dkms_multiver_test -v 1.0 << EOF + +@@ -796,6 +797,7 @@ if [[ -e "/lib/modules/${KERNEL_VER}/${e + echo >&2 "Error: module not removed in /lib/modules/${KERNEL_VER}/${expected_dest_loc}/dkms_multiver_test.ko${mod_compression_ext}" + exit 1 + fi ++fi + + echo 'Unbuilding the multiver test modules' + run_with_expected_output dkms unbuild -k "${KERNEL_VER}" -m dkms_multiver_test -v 1.0 << EOF |