Merge branch 'podman-trixie' into 'master'

Update podman to trixie and prepare make clean for it

See merge request redox-os/redox!1628
This commit is contained in:
Jeremy Soller 2025-08-15 06:59:47 -06:00
commit 697cf83352
2 changed files with 4 additions and 5 deletions

View File

@ -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

View File

@ -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 \