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

Merge branch 'repo-fs-config' into 'master'

Browse Source 
Use cookbook new filesystem config

See merge request redox-os/redox!1665
This commit is contained in:
Jeremy Soller 2025-10-31 11:22:02 -06:00
commit 5a3b2bddfb
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook

@ -1 +1 @@
Subproject commit e21fa22cc438ec960c955564e0bc01b0e20b4d26 Subproject commit 49a246c2b9d25e6bbd4690799a333e95b0d52cbb

7
mk/ci.mk
View File

@ -29,12 +29,9 @@ else
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release $(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release $(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release $(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
export PATH="$(PREFIX_PATH):$$PATH" && \ export CI=1 PATH="$(PREFIX_PATH):$$PATH" COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c config/$(ARCH)/ci.toml)" && \ PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c config/$(ARCH)/ci.toml)" && \
cd cookbook && \ ./cookbook/repo.sh $(REPO_NONSTOP) --with-package-deps "--filesystem=../config/$(ARCH)/ci.toml"
./fetch.sh "$${PACKAGES}" && \
./repo.sh $(REPO_NONSTOP) "$${PACKAGES}"
endif endif
# CI toolchain # CI toolchain

37
mk/repo.mk
View File

@ -6,18 +6,24 @@ ifeq ($(PODMAN_BUILD),1)
else else
export PATH="$(PREFIX_PATH):$$PATH" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c $(FILESYSTEM_CONFIG))" && \ ./cookbook/repo.sh $(REPO_NONSTOP) $(REPO_OFFLINE) --with-package-deps "--filesystem=../$(FILESYSTEM_CONFIG)"
./cookbook/repo.sh $(REPO_NONSTOP) $(REPO_OFFLINE) --with-package-deps "$${PACKAGES}"
mkdir -p $(BUILD) mkdir -p $(BUILD)
# make sure fstools.tag are newer than the things repo modifies # make sure fstools.tag are newer than the things repo modifies
touch $(FSTOOLS_TAG) touch $(FSTOOLS_TAG)
touch $@ touch $@
endif endif
comma := , comma := ,
# Find recipe # List all recipes in a tree fashion specified by the filesystem config
tree: $(FSTOOLS_TAG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
@cd ./cookbook && ./target/release/repo tree --with-package-deps "--filesystem=../$(FILESYSTEM_CONFIG)"
endif
# Find recipe for one or more targets separated by comma
find.%: $(FSTOOLS_TAG) FORCE find.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
@ -25,7 +31,7 @@ else
@cd ./cookbook && ./target/release/repo find $(foreach f,$(subst $(comma), ,$*),$(f)) @cd ./cookbook && ./target/release/repo find $(foreach f,$(subst $(comma), ,$*),$(f))
endif endif
# Invoke clean.sh for one or more targets separated by comma # Invoke clean for one or more targets separated by comma
c.%: $(FSTOOLS_TAG) FORCE c.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
@ -33,7 +39,7 @@ else
cd ./cookbook && ./target/release/repo clean $(foreach f,$(subst $(comma), ,$*),$(f)) cd ./cookbook && ./target/release/repo clean $(foreach f,$(subst $(comma), ,$*),$(f))
endif endif
# Invoke fetch.sh for one or more targets separated by comma # Invoke fetch for one or more targets separated by comma
f.%: $(FSTOOLS_TAG) FORCE f.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
@ -77,7 +83,24 @@ endif
pp.%: $(FSTOOLS_TAG) FORCE pp.%: $(FSTOOLS_TAG) FORCE
$(MAKE) p.$*,--with-package-deps $(MAKE) p.$*,--with-package-deps
# Invoke unfetch.sh for one or more targets separated by comma # Push all recipes specified by the filesystem config
push: $(FSTOOLS_TAG) FORCE
@rm -f $(MOUNTED_TAG)
@if [ ! -d "$(MOUNT_DIR)" ]; then \
$(MAKE) mount; \
touch $(MOUNTED_TAG); \
fi
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
cd ./cookbook && ./target/release/repo push --with-package-deps "--filesystem=../$(FILESYSTEM_CONFIG)" "--sysroot=../$(MOUNT_DIR)"
endif
@if [ -f $(MOUNTED_TAG) ]; then \
$(MAKE) unmount && rm -f $(MOUNTED_TAG); \
else echo "Not unmounting by ourself, don't forget to do it"; \
fi
# Invoke unfetch for one or more targets separated by comma
u.%: $(FSTOOLS_TAG) FORCE u.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@