From: Antonio Russo <antonio.e.russo@gmail.com>
Date: Sun, 1 Jul 2018 12:54:48 +0000 (-0400)
Subject: make dkms distdir before build
X-Git-Tag: debian/0.7.11-3~17
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fb0b8605fa8f6a449589dfb2077cd3ed03e236c0;p=mirror_zfs-debian.git

make dkms distdir before build

Per discussion with Fabian Gruenbichler, avoid pulling build artifacts
into the dkms source by extracting it ahead of dh_auto_build

Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>
---

diff --git a/debian/rules b/debian/rules
index a699b052..f3f15e4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,14 @@ endif
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-config=user
 
+override_dh_auto_build:
+	@# Get a bare copy of the source code for DKMS.
+	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
+	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
+	$(MAKE) distdir
+
+	dh_auto_build
+
 override_dh_auto_test:
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
@@ -81,11 +89,6 @@ override_dh_auto_install:
 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 
-	@# Get a bare copy of the source code for DKMS.
-	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
-	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
-	$(MAKE) distdir
-
 	@# Install the DKMS source.
 	@# We only want the files needed to build the modules
 	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts'