debian: update packaging for DB410c firmwaredebian/1032.1.1-1

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

5 files changed, 14 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index ddc89b4..fed0f61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,4 @@
-linux-board-support-package-dragonboard820c (01700.1-2) UNRELEASED; urgency=medium
-
-  * Updated packaging
-
- -- Nicolas Dechesne <nicolas.dechesne@linaro.org>  Thu, 09 Nov 2017 12:03:05 +0100
-
-linux-board-support-package-dragonboard820c (01700.1-1) buster; urgency=medium
+linux-board-support-package-dragonboard410c (1032.1.1-1) buster; urgency=medium
 
   * Initial release
 
diff --git a/debian/control b/debian/control
index 036116c..c5a5cc8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
-Source: linux-board-support-package-dragonboard820c
+Source: linux-board-support-package-dragonboard410c
 Section: non-free/kernel
 Priority: optional
 Maintainer: Nicolas Dechesne <nicolas.dechesne@linaro.org>
 Standards-Version: 3.9.5
 Build-Depends: unzip, debhelper (>= 5)
-Vcs-Browser: https://git.linaro.org/landing-teams/working/qualcomm/pkg/linux-board-support-package-dragonboard820c.git
+Vcs-Browser: https://git.linaro.org/landing-teams/working/qualcomm/pkg/linux-board-support-package-dragonboard410c.git
 
-Package: firmware-qcom-dragonboard820c
+Package: firmware-qcom-dragonboard410c
 Architecture: all
 Section: non-free/kernel
-Description: Binary firmware for various Qualcomm drivers used on Dragonboard 820c
+Description: Binary firmware for various Qualcomm drivers used on Dragonboard 410c
  This package contains the binary firmware for GPU, Venus, DSP hardware
- coprocessors found on APQ8096, which is the main SoC on the Dragonboard 820c.
+ coprocessors found on APQ8016, which is the main SoC on the Dragonboard 410c.
  .
diff --git a/debian/firmware-qcom-dragonboard410c.install b/debian/firmware-qcom-dragonboard410c.install
new file mode 100644
index 0000000..39a2374
--- /dev/null
+++ b/debian/firmware-qcom-dragonboard410c.install
@@ -0,0 +1,6 @@
+linux-board-support-package*/proprietary-linux/venus.* lib/firmware/qcom/venus-1.8/
+linux-board-support-package*/proprietary-linux/a300*.* lib/firmware
+linux-board-support-package*/proprietary-linux/wlan lib/firmware
+linux-board-support-package*/proprietary-linux/wcnss.* lib/firmware
+linux-board-support-package*/proprietary-linux/modem.* lib/firmware
+linux-board-support-package*/proprietary-linux/mba.mbn lib/firmware
diff --git a/debian/firmware-qcom-dragonboard820c.install b/debian/firmware-qcom-dragonboard820c.install
deleted file mode 100644
index 0a26cb2..0000000
--- a/debian/firmware-qcom-dragonboard820c.install
+++ /dev/null
@@ -1,3 +0,0 @@
-linux-board-support-package*/proprietary-linux/venus.* lib/firmware/qcom/venus-4.2/
-linux-board-support-package*/proprietary-linux/a530*.* lib/firmware
-linux-board-support-package*/proprietary-linux/adsp*.* lib/firmware
diff --git a/debian/rules b/debian/rules
index 941a63b..9e28cbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,9 @@ DIR_ORIG = ./$(UPSTREAM_SOURCE)-r$(VERSION_UPSTREAM)
 ZIP_ORIG = linux-board-support-package-r$(VERSION_UPSTREAM).zip
 
 override_dh_auto_build:
-	unzip -q $(ZIP_ORIG) "*/proprietary-linux/*" "*/LICENSE"
+	unzip -q $(ZIP_ORIG) "*/proprietary-linux/*" "*/bootloaders-linux/NON-HLOS.bin" "*/LICENSE"
 	cp $(DIR_ORIG)/LICENSE debian/copyright
+	MTOOLS_SKIP_CHECK=1 mcopy -i $(DIR_ORIG)//bootloaders-linux/NON-HLOS.bin ::image/modem.* ::image/mba.mbn ::image/wcnss.* $(DIR_ORIG)/proprietary-linux
 
 override_dh_auto_clean:
 	rm -rf $(DIR_ORIG)