From 167d0f075dacf87087b8af5ca28db4622fff6c96 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 15 Nov 2025 11:44:48 +0700 Subject: [PATCH] Fix configuration for build server --- mk/ci.mk | 3 +-- mk/config.mk | 1 - mk/podman.mk | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mk/ci.mk b/mk/ci.mk index 33ee1f52..0165a6a8 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -29,8 +29,7 @@ else $(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release $(HOST_CARGO) build --manifest-path cookbook/pkgar/Cargo.toml --release $(HOST_CARGO) build --manifest-path installer/Cargo.toml --release - export CI=1 PATH="$(PREFIX_PATH):$$PATH" COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c config/$(ARCH)/ci.toml)" && \ + export CI=1 COOKBOOK_LOGS=true PATH="$(PREFIX_PATH):$$PATH" COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ ./cookbook/repo.sh $(REPO_APPSTREAM) $(REPO_NONSTOP) --with-package-deps "--filesystem=../config/$(ARCH)/ci.toml" endif diff --git a/mk/config.mk b/mk/config.mk index 44c20a48..cfba16aa 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -139,7 +139,6 @@ INSTALLER=$(FSTOOLS)/bin/redox_installer REDOXFS=$(FSTOOLS)/bin/redoxfs REDOXFS_MKFS=$(FSTOOLS)/bin/redoxfs-mkfs INSTALLER_OPTS= -LIST_PACKAGES=installer/target/release/list_packages LIST_PACKAGES_OPTS= ifeq ($(REPO_BINARY),0) INSTALLER_OPTS+=--cookbook=cookbook diff --git a/mk/podman.mk b/mk/podman.mk index 1b50024d..bae4845d 100644 --- a/mk/podman.mk +++ b/mk/podman.mk @@ -19,7 +19,8 @@ PODMAN_HOME?=$(ROOT)/build/podman ## Podman command with its many arguments PODMAN_VOLUMES?=--volume $(ROOT):$(CONTAINER_WORKDIR)$(PODMAN_VOLUME_FLAG) --volume $(PODMAN_HOME):/root$(PODMAN_VOLUME_FLAG) PODMAN_ENV?=--env PATH=/root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --env PODMAN_BUILD=0 -PODMAN_CONFIG?=--env ARCH=$(ARCH) --env BOARD=$(BOARD) --env CONFIG_NAME=$(CONFIG_NAME) --env FILESYSTEM_CONFIG=$(FILESYSTEM_CONFIG) --env REPO_APPSTREAM=$(REPO_APPSTREAM) --env REPO_NONSTOP=$(REPO_NONSTOP) --env REPO_OFFLINE=$(REPO_OFFLINE) --env CI=$(CI) +PODMAN_CONFIG?=--env ARCH=$(ARCH) --env BOARD=$(BOARD) --env CONFIG_NAME=$(CONFIG_NAME) --env FILESYSTEM_CONFIG=$(FILESYSTEM_CONFIG) --env PREFIX_BINARY=$(PREFIX_BINARY) \ + --env REPO_APPSTREAM=$(REPO_APPSTREAM) --env REPO_BINARY=$(REPO_BINARY) --env REPO_NONSTOP=$(REPO_NONSTOP) --env REPO_OFFLINE=$(REPO_OFFLINE) --env CI=$(CI) PODMAN_OPTIONS?=--rm --workdir $(CONTAINER_WORKDIR) --interactive --tty --cap-add SYS_ADMIN --device /dev/fuse --network=host --env TERM=$(TERM) PODMAN_RUN?=podman run $(PODMAN_OPTIONS) $(PODMAN_VOLUMES) $(PODMAN_ENV) $(PODMAN_CONFIG) $(IMAGE_TAG)