From c0ccfc157220cae88a5641207ad8ed85df7cf42a Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Mon, 5 Aug 2024 11:46:18 -0700 Subject: [PATCH] Don't run fetch if rebuildinga --- Makefile | 2 +- mk/repo.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 18b4116..8532c8e 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ image: rebuild: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -rf $(BUILD) + rm -rf $(BUILD)/repo.tag $(BUILD)/harddrive.img $(BUILD)/livedisk.iso $(MAKE) all clean: $(CONTAINER_TAG) diff --git a/mk/repo.mk b/mk/repo.mk index 0291c68..3f6753d 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -20,8 +20,9 @@ else cd cookbook && \ ./repo.sh $(REPO_NONSTOP) "$${PACKAGES}" mkdir -p $(BUILD) - # make sure fetch.tag is newer than the things repo modifies - touch $< + # make sure fstools.tag and fetch.tag are newer than the things repo modifies + touch $(FSTOOLS_TAG) + touch $(BUILD)/fetch.tag touch $@ endif