Update the packagingHEADmaster

  * Stop including mdt+bNN firmware files, not necessary anymore.
  * Update firmware paths to follow current kernel expectations.
  * Fix old changelog.
  * Update debhelper compat to 12.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>

5 files changed, 17 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index df6de98..f879450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+linux-board-support-package-dragonboard410c (1034.2.1-7) unstable; urgency=medium
+
+  * Stop including mdt+bNN firmware files, not necessary anymore.
+  * Update firmware paths to follow current kernel expectations.
+  * Fix old changelog.
+  * Update debhelper compat to 12.
+
+ -- Dmitry Baryshkov <dbaryshkov@gmail.com>  Thu, 20 Oct 2022 16:28:48 +0300
+
 linux-board-support-package-dragonboard410c (1034.2.1-6) unstable; urgency=medium
 
   * Provide squashed firmware images for wcnss and modem.
@@ -15,7 +24,7 @@ linux-board-support-package-dragonboard410c (1034.2.1-4) buster; urgency=medium
 
   * Add modem and wirless firmware into SoC folder (qcom/msm8916)
 
- -- Anibal Limon <anibal.limon@linaro.org>  Wed 15 Jan 2020 10:59:04 PM UTC
+ -- Anibal Limon <anibal.limon@linaro.org>  Wed, 15 Jan 2020 22:59:04 +0000
 
 linux-board-support-package-dragonboard410c (1034.2.1-3) buster; urgency=medium
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index d7f1fbb..1c3506a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: non-free/kernel
 Priority: optional
 Maintainer: Nicolas Dechesne <nicolas.dechesne@linaro.org>
 Standards-Version: 3.9.5
-Build-Depends: unzip, mtools, debhelper (>= 5)
+Build-Depends: unzip, mtools, debhelper-compat (= 12)
 Vcs-Browser: https://git.linaro.org/landing-teams/working/qualcomm/pkg/linux-board-support-package-dragonboard410c.git
 
 Package: firmware-qcom-dragonboard410c
diff --git a/debian/firmware-qcom-dragonboard410c.install b/debian/firmware-qcom-dragonboard410c.install
index 04da5cb..75e8e38 100644
--- a/debian/firmware-qcom-dragonboard410c.install
+++ b/debian/firmware-qcom-dragonboard410c.install
@@ -1,5 +1,6 @@
 linux-board-support-package*/proprietary-linux/wlan lib/firmware
-linux-board-support-package*/proprietary-linux/wcnss.* lib/firmware/qcom/msm8916
-linux-board-support-package*/proprietary-linux/modem.* lib/firmware/qcom/msm8916
-linux-board-support-package*/proprietary-linux/mba.mbn lib/firmware/qcom/msm8916
+WCNSS_qcom_wlan_nv_sbc.bin lib/firmware/qcom/apq8016
+linux-board-support-package*/proprietary-linux/wcnss.mbn lib/firmware/qcom/apq8016
+linux-board-support-package*/proprietary-linux/modem.mbn lib/firmware/qcom/apq8016
+linux-board-support-package*/proprietary-linux/mba.mbn lib/firmware/qcom/apq8016
 linux-board-support-package*/efs-seed/modem_fsg boot/
diff --git a/debian/rules b/debian/rules
index 174dcac..a8223ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,13 @@ override_dh_auto_build:
 	gcc -O debian/pil-squasher.c -o pil-squasher
 	./pil-squasher $(DIR_ORIG)/proprietary-linux/modem.mbn $(DIR_ORIG)/proprietary-linux/modem.mdt
 	./pil-squasher $(DIR_ORIG)/proprietary-linux/wcnss.mbn $(DIR_ORIG)/proprietary-linux/wcnss.mdt
+	cp $(DIR_ORIG)/proprietary-linux/wlan/prima/WCNSS_qcom_wlan_nv.bin WCNSS_qcom_wlan_nv_sbc.bin
 
 override_dh_auto_clean:
 	rm -rf pil-squasher
 	rm -rf $(DIR_ORIG)
 	rm -f debian/copyright
+	rm -f WCNSS_qcom_wlan_nv_sbc.bin
 
 %:
 	dh $@