ipv4: convert dst_metrics.refcnt from atomic_t to refcount_t

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

diff --git a/debian/rules b/debian/rules
index 5fbe78f3265ebae530882c3054304af7ac8a7b19..7519bc4a9d327f4e4e2531ed038ad50ff12ab1c3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,14 +35,13 @@ include $(DROOT)/rules.d/1-maintainer.mk
 
 do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86)))
 do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv)))
-do_tools_common=true
+do_tools_common?=true
 
 # Don't build tools or udebs in a cross compile environment.
 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
@@ -66,6 +65,9 @@ ifeq ($(do_mainline_build),true)
        do_tools=false
        no_dumpfile=1
        do_zfs=false
+       skipabi=true
+       skipmodule=true
+       skipretpoline=true
 endif
 
 # Disable tools build and packaging if do_tools != true
@@ -75,13 +77,18 @@ ifneq ($(do_tools),true)
        do_tools_common=
 endif
 
+ifeq ($(do_zfs),false)
+       do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore)
+endif
+
 # Either tools package needs the common source preparation
 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))
+disable_d_i=true
 endif
 
 # Debian Build System targets
@@ -112,6 +119,9 @@ clean: debian/control
        # Install the copyright information.
        cp $(DEBIAN)/copyright debian/copyright
 
+       # Install the retpoline extractor.
+       cp $(DROOT)/scripts/retpoline-extract-one scripts/ubuntu-retpoline-extract-one
+
        # If we have a reconstruct script use it.
        [ -f $(DEBIAN)/reconstruct ] && bash $(DEBIAN)/reconstruct
 
@@ -120,7 +130,8 @@ clean: debian/control
 
 distclean: clean
        rm -rf $(DROOT)/control debian/changelog \
-               debian/control debian/control.stub debian/copyright
+               debian/control debian/control.stub debian/copyright \
+               scripts/ubuntu-retpoline-extract-one
 
 # Builds the image, arch headers and debug packages
 include $(DROOT)/rules.d/2-binary-arch.mk