i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3rdparty/docker/bootstrap: Fix a few potential mis-steps during the bootstrap init

Browse Source 
Change-Id: I381fd7c00957e9d6797b0a79beacdef981593d3f
This commit is contained in:
Alexander von Gluck IV
2019-12-09 10:28:45 -06:00
parent c67dde0f2c
commit b84574958d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/docker/bootstrap/Makefile
Vendored
+2 -2
View File
@@ -7,13 +7,13 @@ 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: default:
${ENGINE} build . -t docker.io/haiku/bootstrap ${ENGINE} build . --no-cache -t docker.io/haiku/bootstrap
clean: clean:
${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} kill {} ${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} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} rm {}
${ENGINE} volume rm bootstrap_work ${ENGINE} volume rm bootstrap_work
init: init:
${ENGINE} run -v bootstrap_work:/work docker.io/haiku/bootstrap prep ${ENGINE} run -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap prep
crosstools: crosstools:
${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap crosstools ${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap crosstools
bootstrap: bootstrap:
3rdparty/docker/bootstrap/prep.sh
Vendored
+2 -1
View File
@@ -38,9 +38,10 @@ if [ ! -d $WORKPATH/src/haiku ]; then
git clone $GIT_HAIKU $WORKPATH/src/haiku git clone $GIT_HAIKU $WORKPATH/src/haiku
fi fi
mkdir $WORKPATH/bin mkdir -p $WORKPATH/bin
if [ ! -f $WORKPATH/bin/jam ]; then if [ ! -f $WORKPATH/bin/jam ]; then
cd $WORKPATH/src/buildtools/jam cd $WORKPATH/src/buildtools/jam
rm -rf bin.*
make make
cp -f bin.linuxx86/jam $WORKPATH/bin/jam cp -f bin.linuxx86/jam $WORKPATH/bin/jam
cd - cd -