From 5c9ee5d02863ec2cd32a03a209aea0d3c096639a Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 9 Dec 2019 12:34:14 -0600 Subject: [PATCH] docker/bootstrap: rename init to prep to be consistent Change-Id: Ie6dc9061b13b23997f84a1ffe886d7e09c242cf0 --- 3rdparty/docker/bootstrap/Makefile | 4 ++-- 3rdparty/docker/bootstrap/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/docker/bootstrap/Makefile b/3rdparty/docker/bootstrap/Makefile index 1a42dc9665..271403a1d6 100644 --- a/3rdparty/docker/bootstrap/Makefile +++ b/3rdparty/docker/bootstrap/Makefile @@ -4,7 +4,7 @@ ENGINE=docker # Example mounting source code directory into container # (lets you "work on the code used to bootstrap" a bit easier) SOURCES=$(HOME)/Code -#EXTRA=-v $(SOURCES)/haiku:/work/src/haiku -v $(SOURCES)/buildtools:/work/src/buildtools +EXTRA=-v $(SOURCES)/haiku:/work/src/haiku -v $(SOURCES)/buildtools:/work/src/buildtools default: ${ENGINE} build . --no-cache -t docker.io/haiku/bootstrap @@ -12,7 +12,7 @@ clean: ${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} kill {} ${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} rm {} ${ENGINE} volume rm bootstrap_work -init: +prep: ${ENGINE} run -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap prep crosstools: ${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap crosstools diff --git a/3rdparty/docker/bootstrap/README.md b/3rdparty/docker/bootstrap/README.md index 09336f686c..8c82232496 100644 --- a/3rdparty/docker/bootstrap/README.md +++ b/3rdparty/docker/bootstrap/README.md @@ -25,7 +25,7 @@ from the end users host and create more-reproduceable bootstrap builds. 2) Check out the required sources -```make init``` +```make prep``` 3) Build the crosstools (gcc only) for your target architecture