Merge branch 'no-fetch-on-rebuild' into 'master'
Don't run fetch if rebuilding See merge request redox-os/redox!1481
This commit is contained in:
commit
95feef9f56
2
Makefile
2
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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue