From 996e9d5463bc3b9f4326e8bf4bca575cac315709 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Thu, 20 Nov 2025 07:05:44 -0800
Subject: [PATCH] Apply filesystem config to r target

---
 mk/config.mk | 2 +-
 mk/repo.mk   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mk/config.mk b/mk/config.mk
index e5fe483a9..0eba4a575 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -142,7 +142,7 @@ INSTALLER=$(FSTOOLS)/bin/redox_installer
 REDOXFS=$(FSTOOLS)/bin/redoxfs
 REDOXFS_MKFS=$(FSTOOLS)/bin/redoxfs-mkfs
 INSTALLER_OPTS=
-COOKBOOK_OPTS=--with-package-deps "--filesystem=../$(FILESYSTEM_CONFIG)"
+COOKBOOK_OPTS="--filesystem=../$(FILESYSTEM_CONFIG)"
 ifeq ($(REPO_BINARY),0)
 INSTALLER_OPTS+=--cookbook=cookbook
 else
diff --git a/mk/repo.mk b/mk/repo.mk
index fa3c3790c..27669efbd 100644
--- a/mk/repo.mk
+++ b/mk/repo.mk
@@ -6,7 +6,7 @@ ifeq ($(PODMAN_BUILD),1)
 else
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-	./cookbook/repo.sh $(REPO_APPSTREAM) $(REPO_NONSTOP) $(REPO_OFFLINE) $(COOKBOOK_OPTS)
+	./cookbook/repo.sh $(REPO_APPSTREAM) $(REPO_NONSTOP) $(REPO_OFFLINE) $(COOKBOOK_OPTS) --with-package-deps
 	mkdir -p $(BUILD)
 	# make sure fstools.tag are newer than the things repo modifies
 	touch $(FSTOOLS_TAG)
@@ -20,7 +20,7 @@ tree: $(FSTOOLS_TAG) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
-	@cd ./cookbook && ./target/release/repo tree $(COOKBOOK_OPTS)
+	@cd ./cookbook && ./target/release/repo tree $(COOKBOOK_OPTS) --with-package-deps
 endif
 
 # Find recipe for one or more targets separated by comma
@@ -56,7 +56,7 @@ ifeq ($(PODMAN_BUILD),1)
 else
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-	./cookbook/repo.sh $(REPO_OFFLINE) $(foreach f,$(subst $(comma), ,$*),$(f))
+	./cookbook/repo.sh $(REPO_OFFLINE) $(foreach f,$(subst $(comma), ,$*),$(f)) $(COOKBOOK_OPTS)
 endif
 
 MOUNTED_TAG=$(MOUNT_DIR)~
@@ -94,7 +94,8 @@ else
 		$(MAKE) mount; \
 		touch $(MOUNTED_TAG); \
 	fi
-	cd ./cookbook && ./target/release/repo push $(COOKBOOK_OPTS) "--sysroot=../$(MOUNT_DIR)"
+	$(if $(findstring nonstop,$(REPO_NONSTOP)),export COOKBOOK_NONSTOP=true && ,) cd ./cookbook && \
+	./target/release/repo push $(COOKBOOK_OPTS) --with-package-deps "--sysroot=../$(MOUNT_DIR)"
 	@if [ -f $(MOUNTED_TAG) ]; then \
 		$(MAKE) unmount && rm -f $(MOUNTED_TAG); \
 	else echo "Not unmounting by ourself, don't forget to do it"; \