UBUNTU: [debian] prep linux-libc-dev only if do_libc_dev_package=true

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

diff --git a/debian/rules b/debian/rules
index a2b369745fc70ac40be63c7a3f9f1ef2a1e757a0..61680be586f0c11ae0800efeae5a9d502af53579 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,7 +77,9 @@ ifneq ($(do_tools),true)
        do_tools_common=
 endif
 
-do_zfs=false
+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)))
@@ -84,6 +88,7 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
 #  only build the first flavour on the assumption it is representative
 ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
 flavours := $(firstword $(flavours))
+disable_d_i=true
 endif
 
 # Debian Build System targets