force no-lintian flag

.travis.yml

@@ -30,6 +30,8 @@ install:
   - update-binfmts --enable qemu-arm
 
 env:
+  global:
+  - SMPFLAGS=-j4
   matrix:
   - OS=el DIST=6
   - OS=el DIST=6 ARCH=i386 DOCKER_REPO=knnniggett/packpack

utils/packpack/environment

@@ -1,3 +0,0 @@
-DEB_BUILD_OPTIONS=parallel=4
-DEBUILD_LINTIAN=no
-

utils/packpack/envvars.patch

@@ -1,25 +0,0 @@
-From 871835ecc4ee380fe42d1ef2a58dca9dc4e9af5f Mon Sep 17 00:00:00 2001
-From: Andrew Bauer <zonexpertconsulting@outlook.com>
-Date: Wed, 21 Feb 2018 12:07:12 -0600
-Subject: [PATCH] allow one to load custom environment variables
-
----
- packpack | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/packpack b/packpack
-index 6f4c80f..abab604 100755
---- a/packpack/packpack
-+++ b/packpack/packpack
-@@ -128,6 +128,11 @@ chmod a+x ${BUILDDIR}/userwrapper.sh
- env | grep -E "^PRODUCT=|^VERSION=|^RELEASE=|^ABBREV=|^TARBALL_|^CHANGELOG_|^CCACHE_|^PACKAGECLOUD_|^SMPFLAGS=|^OS=|^DIST=" \
-     > ${BUILDDIR}/env
- 
-+# Load user environment variables
-+if [ -f "${USER_ENV_FILE}" ]; then
-+    cat ${USER_ENV_FILE} >> ${BUILDDIR}/env
-+fi
-+
- #
- # Setup cache directory
- #

utils/packpack/nolintian.patch

@@ -0,0 +1,22 @@
+From 634281a4204467b9a3c8a1a5febcc8dd9828e0f6 Mon Sep 17 00:00:00 2001
+From: Andy Bauer <knnniggett@hotmail.com>
+Date: Thu, 22 Feb 2018 08:53:50 -0600
+Subject: [PATCH] don't run lintian checks to speed up build
+
+---
+ pack/deb.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pack/deb.mk b/pack/deb.mk
+index de4a0b7..bddf9df 100644
+--- a/pack/deb.mk
++++ b/pack/deb.mk
+@@ -130,7 +130,7 @@ $(BUILDDIR)/$(DPKG_CHANGES): $(BUILDDIR)/$(PRODUCT)-$(VERSION)/debian \
+ 	@echo "Building Debian packages"
+ 	@echo "-------------------------------------------------------------------"
+ 	cd $(BUILDDIR)/$(PRODUCT)-$(VERSION) && \
+-		debuild --preserve-envvar CCACHE_DIR --prepend-path=/usr/lib/ccache \
++		debuild --no-lintian --preserve-envvar CCACHE_DIR --prepend-path=/usr/lib/ccache \
+ 		-Z$(TARBALL_COMPRESSOR) -uc -us $(SMPFLAGS)
+ 	rm -rf $(BUILDDIR)/$(PRODUCT)-$(VERSION)/
+ 	@echo "------------------------------------------------------------------"

utils/packpack/startpackpack.sh

@@ -108,10 +108,10 @@ commonprep () {
         patch -p1 < utils/packpack/packpack-rpm.patch
     fi
 
-    # Patch packpack
-    patch --dry-run --silent -f -p1 < utils/packpack/envvars.patch
+    # Skip deb lintian checks to speed up the build
+    patch --dry-run --silent -f -p1 < utils/packpack/nolintian.patch
     if [ $? -eq 0 ]; then
-        patch -p1 < utils/packpack/envvars.patch
+        patch -p1 < utils/packpack/nolintian.patch
     fi
 
     # The rpm specfile requires we download the tarball and manually move it into place
@@ -237,8 +237,6 @@ execpackpack () {
         parms="-f utils/packpack/redhat_package.mk redhat_package"
     else
         parms=""
-        export SMPFLAGS="-j4"
-        export USER_ENV_FILE="utils/packpack/environment"
     fi
 
     if [ "${TRAVIS}" == "true"  ]; then