vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rw_van_221118' into 'master'

Browse source 
Move Rust install to build dir

See merge request redox-os/redox!1291
This commit is contained in:
Jeremy Soller 2022-11-15 23:20:57 +00:00
parent b976d58a2a 09bd6b1bc2
commit f1f8b2e751
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mk/podman.mk
View file

@ -8,7 +8,7 @@ IMAGE_TAG?=redox-base
## Working Directory in Podman
CONTAINER_WORKDIR?=/mnt/redox
## Podman Home Directory
PODMAN_HOME?=build/podman
PODMAN_HOME?="`pwd`/build/podman"
## Podman command with its many arguments
PODMAN_VOLUMES?=--volume "`pwd`":$(CONTAINER_WORKDIR):Z --volume $(PODMAN_HOME):/home:Z
PODMAN_ENV?=--env PATH=/home/poduser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --env PODMAN_BUILD=0
@ -25,8 +25,7 @@ endif
container_clean: FORCE
rm -f build/container.tag
@echo "If podman dir cannot be removed, "
@echo "remove with \"sudo rm\"."
@echo "If podman dir cannot be removed, remove with \"sudo rm\"."
-rm -rf $(PODMAN_HOME) || true
@echo "For complete clean of images and containers, use \"podman system reset\""
-podman image rm --force $(IMAGE_TAG) || true
@ -44,8 +43,7 @@ endif
build/container.tag: $(CONTAINERFILE)
ifeq ($(PODMAN_BUILD),1)
rm -f build/container.tag
@echo "If podman_home dir cannot be removed, "
@echo "remove with \"sudo rm\"."
@echo "If podman_home dir cannot be removed, remove with \"sudo rm\"."
-rm -rf $(PODMAN_HOME) || true
-podman image rm --force $(IMAGE_TAG) || true
mkdir -p $(PODMAN_HOME)