mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-17 15:34:18 +08:00
Update podman to trixie and prepare make clean for it
This commit is contained in:
parent
5f6aa5e4df
commit
4c6b8d2a0e
5
Makefile
5
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
|
||||
|
||||
@ -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 \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user