vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'no-fetch-on-rebuild' into 'master'

Browse source 
Don't run fetch if rebuilding

See merge request redox-os/redox!1481
This commit is contained in:
Jeremy Soller 2024-08-15 14:55:05 +00:00
parent cf8ffe43c1 c0ccfc1572
commit 95feef9f56
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -25,7 +25,7 @@ image:
rebuild: rebuild:
-$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) $(BUILD)/filesystem/ || true
-$(FUMOUNT) /tmp/redox_installer/ || true -$(FUMOUNT) /tmp/redox_installer/ || true
rm -rf $(BUILD) rm -rf $(BUILD)/repo.tag $(BUILD)/harddrive.img $(BUILD)/livedisk.iso
$(MAKE) all $(MAKE) all
clean: $(CONTAINER_TAG) clean: $(CONTAINER_TAG)

5
mk/repo.mk
View file

@ -20,8 +20,9 @@ else
cd cookbook && \ cd cookbook && \
./repo.sh $(REPO_NONSTOP) "$${PACKAGES}" ./repo.sh $(REPO_NONSTOP) "$${PACKAGES}"
mkdir -p $(BUILD) mkdir -p $(BUILD)
# make sure fetch.tag is newer than the things repo modifies # make sure fstools.tag and fetch.tag are newer than the things repo modifies
touch $< touch $(FSTOOLS_TAG)
touch $(BUILD)/fetch.tag
touch $@ touch $@
endif endif