[haiku-commits] haiku: hrev52491 - 3rdparty/docker/bootstrap

  • From: kallisti5@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 4 Nov 2018 10:05:28 -0500 (EST)

hrev52491 adds 2 changesets to branch 'master'
old head: 030d0eb58f0fae4201afcb83a38ac70038393b8d
new head: 3a9228411315c443d49e83142afa4e1d1d71decf
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=3a9228411315+%5E030d0eb58f0f

----------------------------------------------------------------------------

1b7e0197c161: docker/bootstrap: zlib needs cmake
  
  Change-Id: I460f811bd2ea144ea8121772024e19686e2fa9bb

3a9228411315: docker/bootstrap: Make README.md a bit more detailed
  
  Change-Id: If095b584cd99521770280533359da5024ff745bf

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 40 insertions(+), 5 deletions(-)
3rdparty/docker/bootstrap/Dockerfile |  3 +++
3rdparty/docker/bootstrap/README.md  | 42 ++++++++++++++++++++++++++++----

############################################################################

Commit:      1b7e0197c161d89fb2f5edb7ee55743d3c4c8710
URL:         https://git.haiku-os.org/haiku/commit/?id=1b7e0197c161
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Sun Nov  4 15:04:48 2018 UTC

docker/bootstrap: zlib needs cmake

Change-Id: I460f811bd2ea144ea8121772024e19686e2fa9bb

----------------------------------------------------------------------------

diff --git a/3rdparty/docker/bootstrap/Dockerfile 
b/3rdparty/docker/bootstrap/Dockerfile
index a7df4f3d5a..ad64a53778 100644
--- a/3rdparty/docker/bootstrap/Dockerfile
+++ b/3rdparty/docker/bootstrap/Dockerfile
@@ -13,6 +13,9 @@ RUN apt-get install -y git nasm autoconf automake texinfo 
flex \
 # GCC Requirements
 RUN apt-get install -y python
 
+# zlib Requirements
+RUN apt-get install -y cmake
+
 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";

############################################################################

Revision:    hrev52491
Commit:      3a9228411315c443d49e83142afa4e1d1d71decf
URL:         https://git.haiku-os.org/haiku/commit/?id=3a9228411315
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Sun Nov  4 15:05:15 2018 UTC

docker/bootstrap: Make README.md a bit more detailed

Change-Id: If095b584cd99521770280533359da5024ff745bf

----------------------------------------------------------------------------

diff --git a/3rdparty/docker/bootstrap/README.md 
b/3rdparty/docker/bootstrap/README.md
index 48b142f3a1..5456df6911 100644
--- a/3rdparty/docker/bootstrap/README.md
+++ b/3rdparty/docker/bootstrap/README.md
@@ -1,8 +1,40 @@
 # Haiku bootstrap in a container
 
-1) make
-2) make init
-3) TARGET_ARCH=arm make crosstools
-4) TARGET_ARCH=arm make bootstrap
-5) ```make enter``` lets you enter the container and poke around.
+The Haiku bootstrap process is highly dependant on what tools are installed
+on the host machine.  Bootstraped haikuporter builds can pick up on things
+like the locally installed clang vs the gcc toolchain we are providing.
+
+By running bootstrap within a container, we can better isolate the process
+from the end users host and create more-reproduceable bootstrap builds.
+
+> This is designed for GCC bootstraps. In theory if Haiku changed to clang,
+> the need for a crosstools toolchain is removed... however the clang work
+> is too early to know exactly how this process will work.
+
+## Requirements
+
+1) docker
+2) make
+3) An internet connection
+
+## Process
+
+1) Build the docker container
+
+```make```
+
+2) Check out the required sources
+
+```make init```
+
+
+3) Build the crosstools (gcc only) for your target architecture
+
+```TARGET_ARCH=arm make crosstools```
+
+4) Begin the bootstrap (building Haiku + the required bootstrap hpkgs)
+
+```TARGET_ARCH=arm make bootstrap```
+
+5) If you need to enter the build environment, ```make enter``` will quickly 
let you do so.
 6) profit!


Other related posts:

  • » [haiku-commits] haiku: hrev52491 - 3rdparty/docker/bootstrap - kallisti5