Merge pull request #297 from xuzhen/cmp

Fix updating modules with no version

dkms.in

@@ -776,13 +776,17 @@ check_version_sanity()
                 $"You may override by specifying --force."
             return 1
         fi
-    elif [[ "${cmp_res}" = "="* ]]; then
+    elif [[ "${cmp_res}" = "==" ]]; then
         if [[ ! "$force" ]]; then
-            echo $"Module version $(get_module_verinfo "${dkms_module}" | head -n 1) for $4${module_suffix}" >&2
-            echo $"exactly matches what is already found in kernel $1." >&2
-            echo $"DKMS will not replace this module." >&2
-            echo $"You may override by specifying --force." >&2
-            return 1
+            # if the module has neither version nor srcversion/checksum, check the binary files instead
+            local verinfo="$(get_module_verinfo "${dkms_module}")"
+            if [[ "$(echo "$verinfo" | tr -d '[:space:]')" ]] || diff "${kernels_module}" "${dkms_module}" &>/dev/null; then
+                echo $"Module version $(echo "$verinfo" | head -n 1) for $4${module_suffix}" >&2
+                echo $"exactly matches what is already found in kernel $1." >&2
+                echo $"DKMS will not replace this module." >&2
+                echo $"You may override by specifying --force." >&2
+                return 1
+            fi
         fi
     fi
     return 0

run_test.sh

@@ -21,6 +21,7 @@ TEST_MODULES=(
     "dkms_multiver_test"
     "dkms_nover_test"
     "dkms_emptyver_test"
+    "dkms_nover_update_test"
 )
 TEST_TMPDIRS=(
     "/usr/src/dkms_test-1.0/"
@@ -30,6 +31,9 @@ TEST_TMPDIRS=(
     "/usr/src/dkms_multiver_test-2.0"
     "/usr/src/dkms_nover_test-1.0"
     "/usr/src/dkms_emptyver_test-1.0"
+    "/usr/src/dkms_nover_update_test-1.0"
+    "/usr/src/dkms_nover_update_test-2.0"
+    "/usr/src/dkms_nover_update_test-3.0"
     "/tmp/dkms_test_dir_${KERNEL_VER}/"
 )
 TEST_TMPFILES=(
@@ -980,6 +984,156 @@ echo 'Removing /usr/src/dkms_nover_test-1.0 /usr/src/dkms_emptyver_test-1.0'
 rm -r /usr/src/dkms_nover_test-1.0 /usr/src/dkms_emptyver_test-1.0
 
 
+echo 'Adding the nover update test modules 1.0 by directory'
+run_with_expected_output dkms add test/dkms_nover_update_test/1.0 << EOF
+Creating symlink /var/lib/dkms/dkms_nover_update_test/1.0/source -> /usr/src/dkms_nover_update_test-1.0
+EOF
+run_status_with_expected_output 'dkms_nover_update_test' << EOF
+dkms_nover_update_test/1.0: added
+EOF
+if ! [[ -d /usr/src/dkms_nover_update_test-1.0 ]] ; then
+    echo >&2 'Error: directory /usr/src/dkms_nover_update_test-1.0 was not created'
+    exit 1
+fi
+
+echo 'Installing the nover update test 1.0 modules'
+set_signing_message "dkms_nover_update_test" "1.0"
+run_with_expected_output dkms install -k "${KERNEL_VER}" -m dkms_nover_update_test -v 1.0 << EOF
+
+Building module:
+Cleaning build area...
+make -j$(nproc) KERNELRELEASE=${KERNEL_VER} -C /lib/modules/${KERNEL_VER}/build M=/var/lib/dkms/dkms_nover_update_test/1.0/build...
+${SIGNING_MESSAGE}Cleaning build area...
+
+dkms_nover_update_test.ko${mod_compression_ext}:
+Running module version sanity check.
+ - Original module
+   - No original module exists within this kernel
+ - Installation
+   - Installing to /lib/modules/${KERNEL_VER}/${expected_dest_loc}/
+depmod...
+EOF
+run_status_with_expected_output 'dkms_nover_update_test' << EOF
+dkms_nover_update_test/1.0, ${KERNEL_VER}, $(uname -m): installed
+EOF
+
+echo 'Adding the nover update test modules 2.0 by directory'
+run_with_expected_output dkms add test/dkms_nover_update_test/2.0 << EOF
+Creating symlink /var/lib/dkms/dkms_nover_update_test/2.0/source -> /usr/src/dkms_nover_update_test-2.0
+EOF
+run_status_with_expected_output 'dkms_nover_update_test' << EOF
+dkms_nover_update_test/1.0, ${KERNEL_VER}, $(uname -m): installed
+dkms_nover_update_test/2.0: added
+EOF
+if ! [[ -d /usr/src/dkms_nover_update_test-2.0 ]] ; then
+    echo >&2 'Error: directory /usr/src/dkms_nover_update_test-2.0 was not created'
+    exit 1
+fi
+
+echo 'Installing the nover update test 2.0 modules'
+set_signing_message "dkms_nover_update_test" "2.0"
+run_with_expected_output dkms install -k "${KERNEL_VER}" -m dkms_nover_update_test -v 2.0 << EOF
+
+Building module:
+Cleaning build area...
+make -j$(nproc) KERNELRELEASE=${KERNEL_VER} -C /lib/modules/${KERNEL_VER}/build M=/var/lib/dkms/dkms_nover_update_test/2.0/build...
+${SIGNING_MESSAGE}Cleaning build area...
+
+dkms_nover_update_test.ko${mod_compression_ext}:
+Running module version sanity check.
+ - Original module
+   - This kernel never originally had a module by this name
+ - Installation
+   - Installing to /lib/modules/${KERNEL_VER}/${expected_dest_loc}/
+depmod...
+EOF
+run_status_with_expected_output 'dkms_nover_update_test' << EOF
+dkms_nover_update_test/1.0, ${KERNEL_VER}, $(uname -m): built
+dkms_nover_update_test/2.0, ${KERNEL_VER}, $(uname -m): installed
+EOF
+
+echo 'Adding the nover update test modules 3.0 by directory'
+run_with_expected_output dkms add test/dkms_nover_update_test/3.0 << EOF
+Creating symlink /var/lib/dkms/dkms_nover_update_test/3.0/source -> /usr/src/dkms_nover_update_test-3.0
+EOF
+run_status_with_expected_output 'dkms_nover_update_test' << EOF
+dkms_nover_update_test/1.0, ${KERNEL_VER}, $(uname -m): built
+dkms_nover_update_test/2.0, ${KERNEL_VER}, $(uname -m): installed
+dkms_nover_update_test/3.0: added
+EOF
+if ! [[ -d /usr/src/dkms_nover_update_test-3.0 ]] ; then
+    echo >&2 'Error: directory /usr/src/dkms_nover_update_test-3.0 was not created'
+    exit 1
+fi
+
+echo 'Building the nover update test 3.0 modules'
+set_signing_message "dkms_nover_update_test" "3.0"
+run_with_expected_output dkms build -k "${KERNEL_VER}" -m dkms_nover_update_test -v 3.0 << EOF
+
+Building module:
+Cleaning build area...
+make -j$(nproc) KERNELRELEASE=${KERNEL_VER} -C /lib/modules/${KERNEL_VER}/build M=/var/lib/dkms/dkms_nover_update_test/3.0/build...
+${SIGNING_MESSAGE}Cleaning build area...
+EOF
+run_status_with_expected_output 'dkms_nover_update_test' << EOF
+dkms_nover_update_test/1.0, ${KERNEL_VER}, $(uname -m): built
+dkms_nover_update_test/2.0, ${KERNEL_VER}, $(uname -m): installed
+dkms_nover_update_test/3.0, ${KERNEL_VER}, $(uname -m): built
+EOF
+
+MODULE_PATH_2="/var/lib/dkms/dkms_nover_update_test/2.0/${KERNEL_VER}/$(uname -m)/module/dkms_nover_update_test.ko${mod_compression_ext}"
+MODULE_PATH_3="/var/lib/dkms/dkms_nover_update_test/3.0/${KERNEL_VER}/$(uname -m)/module/dkms_nover_update_test.ko${mod_compression_ext}"
+if ! modinfo "${MODULE_PATH_3}" | grep -q '^srcversion:' && ! diff "${MODULE_PATH_2}" "${MODULE_PATH_3}" &>/dev/null; then
+    # On debian, no srcversion in modinfo's output, the installation will always succeed
+    echo 'Notice: Skip installation test on this platform'
+else
+    echo 'Installing the nover update test 3.0 modules (expected error)'
+    set_signing_message "dkms_nover_update_test" "3.0"
+    run_with_expected_error 6 dkms install -k "${KERNEL_VER}" -m dkms_nover_update_test -v 3.0 << EOF
+
+dkms_nover_update_test.ko${mod_compression_ext}:
+Running module version sanity check.
+Module version  for dkms_nover_update_test.ko${mod_compression_ext}
+exactly matches what is already found in kernel ${KERNEL_VER}.
+DKMS will not replace this module.
+You may override by specifying --force.
+Error! Installation aborted.
+EOF
+    run_status_with_expected_output 'dkms_nover_update_test' << EOF
+dkms_nover_update_test/1.0, ${KERNEL_VER}, $(uname -m): built
+dkms_nover_update_test/2.0, ${KERNEL_VER}, $(uname -m): installed
+dkms_nover_update_test/3.0, ${KERNEL_VER}, $(uname -m): built
+EOF
+fi
+
+echo 'Removing the nover update test modules'
+run_with_expected_output dkms remove -k "${KERNEL_VER}" -m dkms_nover_update_test -v 3.0 << EOF
+Module dkms_nover_update_test 3.0 is not installed for kernel ${KERNEL_VER} ($(uname -m)). Skipping...
+Deleting module dkms_nover_update_test-3.0 completely from the DKMS tree.
+EOF
+run_with_expected_output dkms remove -k "${KERNEL_VER}" -m dkms_nover_update_test -v 2.0 << EOF
+Module dkms_nover_update_test-2.0 for kernel ${KERNEL_VER} ($(uname -m)).
+Before uninstall, this module version was ACTIVE on this kernel.
+
+dkms_nover_update_test.ko${mod_compression_ext}:
+ - Uninstallation
+   - Deleting from: /lib/modules/${KERNEL_VER}/${expected_dest_loc}/
+ - Original module
+   - No original module was found for this module on this kernel.
+   - Use the dkms install command to reinstall any previous module version.
+Deleting module dkms_nover_update_test-2.0 completely from the DKMS tree.
+EOF
+run_with_expected_output dkms remove -k "${KERNEL_VER}" -m dkms_nover_update_test -v 1.0 << EOF
+Module dkms_nover_update_test 1.0 is not installed for kernel ${KERNEL_VER} ($(uname -m)). Skipping...
+Deleting module dkms_nover_update_test-1.0 completely from the DKMS tree.
+EOF
+run_status_with_expected_output 'dkms_nover_update_test' << EOF
+EOF
+
+echo 'Removing /usr/src/dkms_nover_update_test-{1,2,3}.0'
+rm -r /usr/src/dkms_nover_update_test-{1,2,3}.0
+
+
 echo 'Checking that the environment is clean'
 check_no_dkms_test
 

test/dkms_nover_update_test/1.0/Makefile

@@ -0,0 +1,7 @@
+obj-m += dkms_nover_update_test.o
+
+all:
+	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
+
+clean:
+	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean

test/dkms_nover_update_test/1.0/dkms.conf

@@ -0,0 +1,12 @@
+
+PACKAGE_NAME="dkms_nover_update_test"
+PACKAGE_VERSION="1.0"
+BUILT_MODULE_NAME="dkms_nover_update_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"
+
+AUTOINSTALL="yes"
+
+DEST_MODULE_LOCATION="/kernel/extra"
+

test/dkms_nover_update_test/1.0/dkms_nover_update_test.c

@@ -0,0 +1,20 @@
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("A Simple dkms test module with no version");
+
+static int __init dkms_test_init(void)
+{
+    printk(KERN_INFO "DKMS Test Module - Loaded\n");
+    return 0;
+}
+
+static void __exit dkms_test_cleanup(void)
+{
+    printk(KERN_INFO "Cleaning up after dkms test module.\n");
+}
+
+module_init(dkms_test_init);
+module_exit(dkms_test_cleanup);

test/dkms_nover_update_test/2.0/Makefile

@@ -0,0 +1,7 @@
+obj-m += dkms_nover_update_test.o
+
+all:
+	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
+
+clean:
+	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean

test/dkms_nover_update_test/2.0/dkms.conf

@@ -0,0 +1,12 @@
+
+PACKAGE_NAME="dkms_nover_update_test"
+PACKAGE_VERSION="2.0"
+BUILT_MODULE_NAME="dkms_nover_update_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"
+
+AUTOINSTALL="yes"
+
+DEST_MODULE_LOCATION="/kernel/extra"
+

test/dkms_nover_update_test/2.0/dkms_nover_update_test.c

@@ -0,0 +1,20 @@
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("A Simple dkms test module with no version!");
+
+static int __init dkms_test_init(void)
+{
+    printk(KERN_INFO "DKMS Test Module - Loaded\n");
+    return 0;
+}
+
+static void __exit dkms_test_cleanup(void)
+{
+    printk(KERN_INFO "Cleaning up after dkms test module.\n");
+}
+
+module_init(dkms_test_init);
+module_exit(dkms_test_cleanup);

test/dkms_nover_update_test/3.0/Makefile

@@ -0,0 +1,7 @@
+obj-m += dkms_nover_update_test.o
+
+all:
+	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
+
+clean:
+	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean

test/dkms_nover_update_test/3.0/dkms.conf

@@ -0,0 +1,12 @@
+
+PACKAGE_NAME="dkms_nover_update_test"
+PACKAGE_VERSION="3.0"
+BUILT_MODULE_NAME="dkms_nover_update_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"
+
+AUTOINSTALL="yes"
+
+DEST_MODULE_LOCATION="/kernel/extra"
+

test/dkms_nover_update_test/3.0/dkms_nover_update_test.c

@@ -0,0 +1,20 @@
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("A Simple dkms test module with no version!");
+
+static int __init dkms_test_init(void)
+{
+    printk(KERN_INFO "DKMS Test Module - Loaded\n");
+    return 0;
+}
+
+static void __exit dkms_test_cleanup(void)
+{
+    printk(KERN_INFO "Cleaning up after dkms test module.\n");
+}
+
+module_init(dkms_test_init);
+module_exit(dkms_test_cleanup);