Makefile: Don't try to rebuild chroots when cross tools are updated.

[distorted-chroot] / Makefile

diff --git a/Makefile b/Makefile
index 08906ba..1f34c0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -457,6 +457,8 @@ $(STATE)/etc/sbuild.conf: etc/sbuild.conf.in $(schroot-config_STAMP)
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,SUBST)$(call subst-file,### -*-perl-*-) \
                <$< >$@.new && mv $@.new $@
+check::; $(call check-symlink,WARN,/etc/sbuild/sbuild.conf,$(HERE)/$(STATE)/etc/sbuild.conf)
+check::; $(call check-executable,WARN,/usr/local.schroot/hacks/apt-get)
 
 SCHROOT_SCRIPTS                += 11private
 SCHROOT_SCRIPTS                += 15binfmt
@@ -519,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 \