hrev52477 adds 1 changeset to branch 'master'
old head: 4ee3f16d6a080e80143f57aaf518911c4c40cdc1
new head: bae2263db95cf674bfe4cd40046c9e3eca2485a5
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=bae2263db95c+%5E4ee3f16d6a08
----------------------------------------------------------------------------
bae2263db95c: docker/bootstrap: Add extra gcc bootstrap requirements
Change-Id: Icacba4faaaab7e9af2b04225f99ef00ea4753606
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52477
Commit: bae2263db95cf674bfe4cd40046c9e3eca2485a5
URL: https://git.haiku-os.org/haiku/commit/?id=bae2263db95c
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Nov 2 21:32:59 2018 UTC
----------------------------------------------------------------------------
3 files changed, 7 insertions(+), 2 deletions(-)
3rdparty/docker/bootstrap/Dockerfile | 5 +++++
3rdparty/docker/bootstrap/Makefile | 2 +-
3rdparty/docker/bootstrap/crosstools.sh | 2 +-
----------------------------------------------------------------------------
diff --git a/3rdparty/docker/bootstrap/Dockerfile
b/3rdparty/docker/bootstrap/Dockerfile
index 328c157ed7..a7df4f3d5a 100644
--- a/3rdparty/docker/bootstrap/Dockerfile
+++ b/3rdparty/docker/bootstrap/Dockerfile
@@ -3,11 +3,16 @@ FROM debian
ENV DEBIAN_FRONTEND="noninteractive"
RUN apt-get update
+
+# Base Haiku requirements
RUN apt-get install -y git nasm autoconf automake texinfo flex \
bison gawk build-essential unzip wget zip less zlib1g-dev \
libcurl4-openssl-dev genisoimage libtool mtools gcc-multilib \
u-boot-tools util-linux device-tree-compiler bc
+# GCC Requirements
+RUN apt-get install -y python
+
ENV GIT_BUILDTOOLS="https://git.haiku-os.org/buildtools";
ENV GIT_HAIKU="https://git.haiku-os.org/haiku";
ENV GIT_HAIKUPORTER="https://github.com/haikuports/haikuporter.git";
diff --git a/3rdparty/docker/bootstrap/Makefile
b/3rdparty/docker/bootstrap/Makefile
index 9355bef3cf..64c54aa2e7 100644
--- a/3rdparty/docker/bootstrap/Makefile
+++ b/3rdparty/docker/bootstrap/Makefile
@@ -1,7 +1,7 @@
default:
docker build . -t docker.io/haiku/bootstrap
clean:
- docker rm docker.io/haiku/bootstrap
+ docker ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I
{} docker rm {}
docker volume rm bootstrap_work
init:
docker run -v bootstrap_work:/work docker.io/haiku/bootstrap prep
diff --git a/3rdparty/docker/bootstrap/crosstools.sh
b/3rdparty/docker/bootstrap/crosstools.sh
index 51722c9970..4d8f28e4ba 100755
--- a/3rdparty/docker/bootstrap/crosstools.sh
+++ b/3rdparty/docker/bootstrap/crosstools.sh
@@ -24,4 +24,4 @@ cd $GENERATED
$WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH
$WORKPATH/src/buildtools \
--bootstrap $WORKPATH/src/haikuporter/haikuporter
$WORKPATH/src/haikuports.cross $WORKPATH/src/haikuports
-echo "If everything was successful, your next step is 'make bootstrap'"
+echo "If everything was successful, your next step is
'TARGET_ARCH=$TARGET_ARCH make bootstrap'"
