mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
Merge branch 'rebuild-always' into 'master'
Always rebuild on rebuild-push See merge request redox-os/redox!2312
This commit is contained in:
commit
1c2720eda3
10
mk/repo.mk
10
mk/repo.mk
@ -1,14 +1,18 @@
|
|||||||
# Configuration file for recipe commands
|
# Configuration file for recipe commands
|
||||||
|
|
||||||
$(REPO_TAG): prefix $(FILESYSTEM_CONFIG) | $(FSTOOLS) $(FSTOOLS_TAG) $(CONTAINER_TAG)
|
$(REPO_TAG): prefix $(FILESYSTEM_CONFIG) | $(FSTOOLS) $(FSTOOLS_TAG) $(CONTAINER_TAG)
|
||||||
|
$(MAKE) cook
|
||||||
|
|
||||||
|
# Internal command for rebuild (this is PHONY; use make rebuild if possible)
|
||||||
|
cook:
|
||||||
ifeq ($(PODMAN_BUILD),1)
|
ifeq ($(PODMAN_BUILD),1)
|
||||||
$(PODMAN_RUN) make $@
|
$(PODMAN_RUN) make $@
|
||||||
else
|
else
|
||||||
|
mkdir -p $(BUILD)
|
||||||
export PATH="$(PREFIX_PATH):$$PATH" && \
|
export PATH="$(PREFIX_PATH):$$PATH" && \
|
||||||
export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
|
export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
|
||||||
$(REPO_BIN) cook $(COOKBOOK_OPTS) --with-package-deps
|
$(REPO_BIN) cook $(COOKBOOK_OPTS) --with-package-deps
|
||||||
mkdir -p $(BUILD)
|
touch $(REPO_TAG)
|
||||||
touch $@
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
comma := ,
|
comma := ,
|
||||||
@ -173,7 +177,7 @@ endif
|
|||||||
|
|
||||||
# Rebuild and push all recipes specified by the filesystem config
|
# Rebuild and push all recipes specified by the filesystem config
|
||||||
rebuild-push: $(FSTOOLS_TAG) FORCE
|
rebuild-push: $(FSTOOLS_TAG) FORCE
|
||||||
$(MAKE) repo
|
$(MAKE) cook
|
||||||
$(MAKE) push
|
$(MAKE) push
|
||||||
|
|
||||||
# Invoke unfetch for one or more targets separated by comma
|
# Invoke unfetch for one or more targets separated by comma
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user