Skip to content
Snippets Groups Projects
Commit 09bd6b1b authored by Ron Williams's avatar Ron Williams
Browse files

Move Rust install to build dir

parent b976d58a
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment