UBUNTU: [Debian] set do_*_tools after stage1 or bootstrap is determined

BugLink: http://bugs.launchpad.net/bugs/1370211
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian/rules b/debian/rules
index 5dace6fc7abac97fab938e1f4dadd06012dd0b63..33bf75d899241a8dce041609b089f565f76a1a23 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,15 +37,6 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
        do_tools=false
 endif
 
-# Backwards compatiblility, do_tools=false|0 should disable all tools.
-ifneq ($(do_tools),true)
-       do_linux_tools=
-       do_cloud_tools=
-endif
-
-# Either tools package needs the common source preparation
-do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
-
 # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap
 ifeq ($(DEB_STAGE),stage1)
     DEB_BUILD_PROFILE=bootstrap
@@ -58,6 +49,15 @@ ifeq ($(DEB_BUILD_PROFILE),bootstrap)
     do_flavour_header_package=false
 endif
 
+# Disable tools build and packaging if do_tools != true
+ifneq ($(do_tools),true)
+       do_linux_tools=
+       do_cloud_tools=
+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)