[PATCH 2/6][Unstable] UBUNTU: [Debian] run install-$(flavour) targets during build phase

[Seth Forshee]

BugLink: https://bugs.launchpad.net/bugs/1930713

Move installation of files from the flavour build directories to the
build phase. This results in cleaning up of one flavour build
directory before starting the build of the next flavour, significantly
reducing the amount of space needed on builders.

Note that this will result in incorrect ownership of files in cases
where the build and binary phases of building packages are run
separately. This will be addressed in a later patch.

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian/rules.d/2-binary-arch.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 71f30b72329c..b6b8640d8b8f 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -39,7 +39,7 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc
 prepare-%: $(stampdir)/stamp-prepare-%
 	@echo Debug: $@
 # Used by developers to allow efficient pre-building without fakeroot.
-build-%: $(stampdir)/stamp-build-%
+build-%: $(stampdir)/stamp-install-%
 	@echo Debug: $@
 
 # Do the actual build, including image and modules
@@ -797,7 +797,7 @@ ifeq ($(any_signed),true)
 	dpkg-distaddfile $(signing_tar) raw-signing -
 endif
 
-build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-build-,$(flavours))
+build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-install-,$(flavours))
 build-arch: $(build-arch-deps-true)
 	@echo Debug: $@
 
-- 
2.31.1