diff -Nru backport-iwlwifi-dkms-9858/debian/backport-iwlwifi-dkms.dkms.in backport-iwlwifi-dkms-9858/debian/backport-iwlwifi-dkms.dkms.in --- backport-iwlwifi-dkms-9858/debian/backport-iwlwifi-dkms.dkms.in 2022-04-19 09:20:09.000000000 +0000 +++ backport-iwlwifi-dkms-9858/debian/backport-iwlwifi-dkms.dkms.in 2022-05-24 11:57:59.000000000 +0000 @@ -3,7 +3,7 @@ AUTOINSTALL="yes" OBSOLETE_BY="5.19.0" -BUILT_MODULE_NAME[0]="compat" +BUILT_MODULE_NAME[0]="iwlwifi-compat" BUILT_MODULE_LOCATION[0]="compat" DEST_MODULE_LOCATION[0]="/updates" @@ -27,6 +27,12 @@ BUILT_MODULE_LOCATION[5]="net/wireless" DEST_MODULE_LOCATION[5]="/updates" +if { echo 5.17; echo "$kernelver"; } | sort -V --check=silent; then + BUILT_MODULE_NAME[6]="iwlmei" + BUILT_MODULE_LOCATION[6]="drivers/net/wireless/intel/iwlwifi/mei" + DEST_MODULE_LOCATION[6]="/updates" +fi + # Find out how many CPU cores can be use if we pass appropriate -j option to make. # DKMS could use all cores on multicore systems to build the kernel module. num_cpu_cores() diff -Nru backport-iwlwifi-dkms-9858/debian/changelog backport-iwlwifi-dkms-9858/debian/changelog --- backport-iwlwifi-dkms-9858/debian/changelog 2022-04-19 09:20:09.000000000 +0000 +++ backport-iwlwifi-dkms-9858/debian/changelog 2022-05-24 11:57:59.000000000 +0000 @@ -1,3 +1,11 @@ +backport-iwlwifi-dkms (9858-0ubuntu3+22.04.1) jammy; urgency=medium + + * install iwlmei when compiled against kernel >= 5.17. (LP: #1975573) + + * compat: rename built module to iwlwifi-compat.ko (LP: #1975593) + + -- You-Sheng Yang Tue, 24 May 2022 19:57:59 +0800 + backport-iwlwifi-dkms (9858-0ubuntu3) jammy; urgency=medium * Fix FTBFS dkms module during kernel builds with a non-default diff -Nru backport-iwlwifi-dkms-9858/debian/patches/0008-compat-rename-built-module-to-iwlwifi-compat.ko.patch backport-iwlwifi-dkms-9858/debian/patches/0008-compat-rename-built-module-to-iwlwifi-compat.ko.patch --- backport-iwlwifi-dkms-9858/debian/patches/0008-compat-rename-built-module-to-iwlwifi-compat.ko.patch 1970-01-01 00:00:00.000000000 +0000 +++ backport-iwlwifi-dkms-9858/debian/patches/0008-compat-rename-built-module-to-iwlwifi-compat.ko.patch 2022-05-24 11:57:59.000000000 +0000 @@ -0,0 +1,46 @@ +From: "You-Sheng Yang (vicamo)" +Date: Mon, 23 May 2022 14:47:26 +0800 +Subject: compat: rename built module to iwlwifi-compat.ko + +BugLink: https://bugs.launchpad.net/bugs/1975593 + +Signed-off-by: You-Sheng Yang (vicamo) +--- + compat/Makefile | 6 ++++-- + scripts/uninstall.sh | 4 ++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/compat/Makefile b/compat/Makefile +index f74f145..fe3c1a0 100644 +--- a/compat/Makefile ++++ b/compat/Makefile +@@ -1,9 +1,11 @@ + ccflags-y += -I$(src) -Wframe-larger-than=1280 + ifeq ($(CONFIG_BACKPORT_INTEGRATE),) +-obj-m += compat.o ++obj-m += iwlwifi-compat.o + else +-obj-y += compat.o ++obj-y += iwlwifi-compat.o + endif ++iwlwifi-compat-y += $(compat-y) ++ + compat-y += main.o + + # Kernel backport compatibility code +diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh +index 91a0fe6..835582e 100755 +--- a/scripts/uninstall.sh ++++ b/scripts/uninstall.sh +@@ -4,9 +4,9 @@ set -e + + source ./scripts/mod_helpers.sh + +-if test "$(mod_filename compat)" = "compat.ko.gz" ; then ++if test "$(mod_filename iwlwifi-compat)" = "iwlwifi-compat.ko.gz" ; then + compr=".gz" +-elif test "$(mod_filename compat)" = "compat.ko.xz" ; then ++elif test "$(mod_filename iwlwifi-compat)" = "iwlwifi-compat.ko.xz" ; then + compr=".xz" + else + compr="" diff -Nru backport-iwlwifi-dkms-9858/debian/patches/series backport-iwlwifi-dkms-9858/debian/patches/series --- backport-iwlwifi-dkms-9858/debian/patches/series 2022-03-25 11:27:00.000000000 +0000 +++ backport-iwlwifi-dkms-9858/debian/patches/series 2022-05-24 11:57:59.000000000 +0000 @@ -1,3 +1,4 @@ 0001-keep-zconf-in-make-clean.patch 0002-fix-format-overflow-compile-error-in-kconf-confdata..patch 0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch +0008-compat-rename-built-module-to-iwlwifi-compat.ko.patch