From 4c6b8d2a0e86450e0cb344ee3e5703aefc9ad9f9 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Fri, 15 Aug 2025 04:49:33 +0000 Subject: [PATCH] Update podman to trixie and prepare make clean for it --- Makefile | 5 ++--- podman/redox-base-containerfile | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cbc345cb..b4fd500f 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,8 @@ ifeq ($(PODMAN_BUILD),1) else cd cookbook && ./clean.sh -rm -rf cookbook/repo - cargo clean --manifest-path installer/Cargo.toml - cargo clean --manifest-path redoxfs/Cargo.toml - cargo clean --manifest-path relibc/Cargo.toml + $(MAKE) fstools_clean + $(HOST_CARGO) clean --manifest-path relibc/Cargo.toml endif -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index 9eb123dd..82f70db7 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -1,6 +1,6 @@ # Configuration file to install the recipe dependencies inside the Podman container -FROM debian:stable-backports +FROM debian:trixie # _UID_ must be replaced with the user's uid on host # podman root is mapped to your user id on host during build, @@ -8,7 +8,7 @@ FROM debian:stable-backports RUN useradd --create-home --no-log-init --uid _UID_ poduser \ && chown -R root:root /home \ && apt-get update \ - && apt-get install -y --no-install-recommends -t stable-backports \ + && apt-get install -y --no-install-recommends \ ant \ appstream \ appstream-compose \