From 78a5a50bf6f8fda4c5eb78a79f27d4b7472cc469 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 10 Sep 2019 02:44:46 +0100
Subject: [PATCH] Makefile: Don't try to rebuild chroots when cross tools are
 updated.

The chroot maintenance doesn't work as make(1).  This needs rethinking.
Stashing these dependencies as recursive make(1) invocations is
hopelessly unsafe.
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index fbbc961..1f34c0c 100644
--- a/Makefile
+++ b/Makefile
@@ -521,12 +521,12 @@ setup-chroots: $(BUILD_CHROOTS)
 $(BUILD_CHROOTS): chroot/%: $(STATE)/stamp/chroot.%
 .PHONY: setup-chroots $(BUILD_CHROOTS)
 
-$(CHROOT_STAMPS): $(STATE)/stamp/chroot.%: \
-		$$(call chroot-deps,$(STATE)/stamp/cross-tools.,$$*)
+$(CHROOT_STAMPS): $(STATE)/stamp/chroot.%:
 	$(V_AT)mkdir -p $(dir $@) log/
 	$(MAKE) \
 		$(STATE)/bin/mkbuildchroot $(STATE)/bin/install-cross-tools \
-		$(STATE)/etc/schroot/sbuild.schroot
+		$(STATE)/etc/schroot/sbuild.schroot \
+		$$(call chroot-deps,$(STATE)/stamp/cross-tools.,$$*)
 	$(call v_tag,CHROOT)$(call v_log,setup-chroot.$*, \
 		$(SILENCE_LVM); \
 		$(ROOTLY) $(STATE)/bin/mkbuildchroot \
-- 
2.11.0