net: pending_confirm is not used anymore

[mirror_ubuntu-zesty-kernel.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2c288aba503f6ebd806fcf4f9ba483ea35d4d70c..5bcd85d77a63fabb646fdd3eb0755c0c1118b342 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
        do_tools=false
        disable_d_i=true
        do_zfs=false
+       do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore)
 endif
 
 # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap
@@ -79,7 +80,7 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
 
 # autopkgtest -- rebuild support
 #  only build the first flavour on the assumption it is representative
-ifeq ($(DEB_BUILD_PROFILE),autopkgtest)
+ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
 flavours := $(firstword $(flavours))
 endif
 
@@ -96,7 +97,7 @@ clean: debian/control
        # d-i stuff
        rm -rf $(DEBIAN)/d-i-$(arch)
        # Generated on the fly.
-       rm -f $(DEBIAN)/d-i/firmware/kernel-image
+       rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image
 
        # normal build junk
        rm -rf $(DEBIAN)/abi/$(release)-$(revision)