MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'deps-rule' into 'master'

Browse Source 
repo: Do not recurse deps at change rule when REPO_BINARY is set

Closes #1855

See merge request redox-os/redox!2280
This commit is contained in:
Jeremy Soller 2026-07-26 05:53:39 -06:00
commit 1de5b9360a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/config.mk
View File

@ -15,7 +15,7 @@ PREFIX_BINARY?=1
## Even more experimental, add -Zbuild-std to cookbook.toml to allow compilation to Tier 3 targets
PREFIX_USE_UPSTREAM_RUST_COMPILER?=0
## Enable to use binary packages (much faster)
REPO_BINARY?=0
REPO_BINARY?=
## Name of the configuration to include in the image name e.g. desktop or server
CONFIG_NAME?=desktop
## Build appstream data for repo

10
mk/repo.mk
View File

@ -269,17 +269,27 @@ ucri.%: $(FSTOOLS_TAG) FORCE
bc.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
ifeq ($(REPO_BINARY),0)
# if explicitly set REPO_BINARY=0 (as opposed to leave it empty), this prevent dependencies to update
$(REPO_BIN) change-rule-local --set-rule=binary $(foreach f,$(subst $(comma), ,$*),$(f))
else
$(REPO_BIN) change-rule --set-rule=binary $(foreach f,$(subst $(comma), ,$*),$(f)) --with-package-deps
endif
endif
# Set recipe rule to "source" then invoke clean
sc.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
ifeq ($(REPO_BINARY),1)
# if explicitly set REPO_BINARY=1, this prevent dependencies to update
$(REPO_BIN) change-rule-local --set-rule=source $(foreach f,$(subst $(comma), ,$*),$(f))
else
$(REPO_BIN) change-rule --set-rule=source $(foreach f,$(subst $(comma), ,$*),$(f)) --with-package-deps
endif
endif
# Set specific recipe rule to "local" then invoke clean
lc.%: $(FSTOOLS_TAG) FORCE