Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:bug-1969434/respect-kernelsourcedir/jammy into ubuntu/+source/backport-iwlwifi-dkms:ubuntu/devel

[You-Sheng Yang]

* respect kernelsourcedir in dkms.conf (LP: #1969434)

In order to be compiled with dkms-build in kernel source package, the kernel header dir will not be /lib/modules/<version>/build but a temporary directory. This change specifies KLIB_BUILD from dkms variable ${kernel_source_dir}.

[Dimitri John Ledkov (xnox)]

review: Approve

diff --git a/debian/backport-iwlwifi-dkms.dkms.in b/debian/backport-iwlwifi-dkms.dkms.in
index f65c78e..61ded49 100644
--- a/debian/backport-iwlwifi-dkms.dkms.in
+++ b/debian/backport-iwlwifi-dkms.dkms.in
@@ -38,5 +38,5 @@ num_cpu_cores()
   fi
 }
 
-MAKE="'make' -j$(num_cpu_cores) KLIB=/lib/modules/$kernelver"
+MAKE="'make' -j$(num_cpu_cores) KLIB=/lib/modules/$kernelver KLIB_BUILD=${kernel_source_dir}"
 CLEAN="'make' clean"
diff --git a/debian/changelog b/debian/changelog
index cac8ec4..fd5270c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+backport-iwlwifi-dkms (9858-0ubuntu3) jammy; urgency=medium
+
+  * respect kernelsourcedir in dkms.conf (LP: #1969434)
+
+ -- You-Sheng Yang <[e-mail]>  Tue, 19 Apr 2022 17:20:09 +0800
+
 backport-iwlwifi-dkms (9858-0ubuntu2) jammy; urgency=medium
 
   * Bump OBSOLETE_BY to v5.19, as this version of the module is suitable