Merge ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:vicamo/for-hwe/sync-debian-7858-deb1 into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/master

[You-Sheng Yang]

* Fix build on recent kernel that removes *.lex.c and *.tab.c at clean stage.
* Switch to non-native build.

[You-Sheng Yang (vicamo)]

Test build in https://code.launchpad.net/~vicamo/+recipe/test-mp-369282-backport-iwlwifi-dkms

[You-Sheng Yang (vicamo)]

Build failed. Need https://gitlab.com/vicamo/backport-iwlwifi-dkms/merge_requests/10 as well.

[You-Sheng Yang (vicamo)]

review: Needs Fixing

[You-Sheng Yang (vicamo)]

Rebuild with updated HEAD passed in all series.

review: Approve

[Anthony Wong (anthonywong)]

Just a minor fix needed in debian/patches/0001-keep-zconf-in-make-clean.patch, otherwise looks good. Thanks.

review: Needs Fixing

[You-Sheng Yang (vicamo)]

> Just a minor fix needed in debian/patches/0001-keep-zconf-in-make-clean.patch,
> otherwise looks good. Thanks.

Addressed.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f6dc7d4..d70c99a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+backport-iwlwifi-dkms (7858-ubuntu2) UNRELEASED; urgency=low
+
+  * Fix build on recent kernel that removes *.lex.c and *.tab.c at clean
+    stage.
+  * Switch to non-native build.
+
+ -- You-Sheng Yang <[e-mail]>  Tue, 25 Jun 2019 18:41:42 +0800
+
 backport-iwlwifi-dkms (7858-ubuntu1) UNRELEASED; urgency=low
 
   * sync with debian 7858.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index accc13f..fca26f6 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,4 @@
 [DEFAULT]
 debian-branch = debian/master
 upstream-branch = upstream/master
+upstream-tree = BRANCH
diff --git a/debian/patches/0001-keep-zconf-in-make-clean.patch b/debian/patches/0001-keep-zconf-in-make-clean.patch
new file mode 100644
index 0000000..2af7729
--- /dev/null
+++ b/debian/patches/0001-keep-zconf-in-make-clean.patch
@@ -0,0 +1,19 @@
+Description: Keep kconf/zconf.{lex,tab}.c during "make clean"
+Author: Anthony Wong <[e-mail]>
+Forwarded: https://www.spinics.net/lists/backports/msg04856.html
+Last-Update: 2019-06-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile.real
++++ b/Makefile.real
+@@ -127,7 +127,10 @@
+ 	@echo Reboot.
+ 	@echo
+ 
++EXCLUDE_CLEAN := kconf/zconf.lex.c kconf/zconf.tab.c
+ .PHONY: clean
+ clean:
++	@$(foreach f, $(EXCLUDE_CLEAN), mv $(f) $(f).orig;)
+ 	@$(MAKE) -f Makefile.build clean
+ 	@$(MAKE) -C kconf clean
++	@$(foreach f, $(EXCLUDE_CLEAN), mv $(f).orig $(f);)
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..118ab0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-keep-zconf-in-make-clean.patch
diff --git a/debian/rules b/debian/rules
index b3eefb4..429ab0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ GENERATED_DKMS_FILES= \
     debian/backport-iwlwifi-dkms.dkms
 
 %:
-	dh $@ --with dkms,modaliases,quilt
+	dh $@ --with dkms,modaliases
 
 override_dh_auto_configure:
 override_dh_auto_build:
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)