diff --git a/mk/ci.mk b/mk/ci.mk index 54820f7d2..a16c60a4d 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -29,7 +29,7 @@ else $(HOST_CARGO) build --manifest-path Cargo.toml --release $(HOST_CARGO) build --manifest-path pkgar/Cargo.toml --release export CI=1 COOKBOOK_LOGS=true PATH="$(PREFIX_PATH):$$PATH" COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - ./repo.sh $(REPO_APPSTREAM) $(REPO_NONSTOP) --with-package-deps "--filesystem=../config/$(ARCH)/ci.toml" + ./repo.sh $(REPO_APPSTREAM) $(REPO_NONSTOP) --with-package-deps "--filesystem=config/$(ARCH)/ci.toml" endif # CI toolchain diff --git a/mk/config.mk b/mk/config.mk index 8246be5fa..64c973376 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="--filesystem=../$(FILESYSTEM_CONFIG)" +COOKBOOK_OPTS="--filesystem=$(FILESYSTEM_CONFIG)" ifeq ($(REPO_BINARY),0) INSTALLER_OPTS+=--cookbook=. else diff --git a/mk/repo.mk b/mk/repo.mk index c81615f1f..5b06f753d 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -73,7 +73,7 @@ else touch $(MOUNTED_TAG); \ fi $(if $(findstring nonstop,$(REPO_NONSTOP)),export COOKBOOK_NONSTOP=true && ,) \ - ./target/release/repo push $(foreach f,$(subst $(comma), ,$*),$(f)) "--sysroot=../$(MOUNT_DIR)" + ./target/release/repo push $(foreach f,$(subst $(comma), ,$*),$(f)) "--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"; \ @@ -95,7 +95,7 @@ else touch $(MOUNTED_TAG); \ fi $(if $(findstring nonstop,$(REPO_NONSTOP)),export COOKBOOK_NONSTOP=true && ,) \ - ./target/release/repo push $(COOKBOOK_OPTS) --with-package-deps "--sysroot=../$(MOUNT_DIR)" + ./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"; \