MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-23 21:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'repo-offline' into 'master'

Browse Source 
Add REPO_OFFLINE option

Closes #1202

See merge request redox-os/redox!1607
This commit is contained in:
Jeremy Soller 2025-07-09 09:47:50 -06:00
commit 722ebf6f30
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mk/config.mk
View File

@ -16,8 +16,9 @@ REPO_BINARY?=0
## Name of the configuration to include in the image name e.g. desktop or server
CONFIG_NAME?=desktop
## Ignore errors when building the repo, attempt to build every package
## REPO_NONSTOP?=--nonstop
REPO_NONSTOP?=
REPO_NONSTOP?=0
## Do not update source repos, attempt to build in offline condition
REPO_OFFLINE?=0
## Select filesystem config
ifeq ($(BOARD),)
FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml
@ -56,6 +57,17 @@ ifeq (,$(shell command -v sccache))
endif
endif
ifeq ($(REPO_NONSTOP),1)
REPO_NONSTOP=--nonstop
else ifeq ($(REPO_NONSTOP),0)
REPO_NONSTOP=
endif
ifeq ($(REPO_OFFLINE),1)
REPO_OFFLINE=--offline
else ifeq ($(REPO_OFFLINE),0)
REPO_OFFLINE=
endif
UNAME := $(shell uname)
ifeq ($(UNAME),Darwin)
FUMOUNT=umount

4
mk/repo.mk
View File

@ -8,7 +8,7 @@ else
PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \
export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
cd cookbook && \
./fetch.sh "$${PACKAGES}"
./fetch.sh $(REPO_NONSTOP) $(REPO_OFFLINE) "$${PACKAGES}"
mkdir -p $(BUILD)
touch $@
endif
@ -21,7 +21,7 @@ else
export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \
cd cookbook && \
./repo.sh $(REPO_NONSTOP) "$${PACKAGES}"
./repo.sh $(REPO_NONSTOP) $(REPO_OFFLINE) "$${PACKAGES}"
mkdir -p $(BUILD)
# make sure fstools.tag and fetch.tag are newer than the things repo modifies
touch $(FSTOOLS_TAG)