hrev52872 adds 1 changeset to branch 'master'
old head: efac84e790c6d5aefa4947d9d16bd03fd3c14b9e
new head: 54624bda43f13312a491fe1c91d22834be3374f5
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=54624bda43f1+%5Eefac84e790c6
----------------------------------------------------------------------------
54624bda43f1: bootstrap: Add some tools to test bootstrap steps
Change-Id: Idac85d5b7c1fadd371efd13fa788a03656e82e66
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52872
Commit: 54624bda43f13312a491fe1c91d22834be3374f5
URL: https://git.haiku-os.org/haiku/commit/?id=54624bda43f1
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Feb 15 17:25:00 2019 UTC
----------------------------------------------------------------------------
4 files changed, 29 insertions(+), 1 deletion(-)
3rdparty/docker/bootstrap/Dockerfile | 2 ++
3rdparty/docker/bootstrap/README.md | 2 +-
3rdparty/docker/bootstrap/haikuports_build.sh | 12 ++++++++++++
3rdparty/docker/bootstrap/haikuports_chroot.sh | 14 ++++++++++++++
----------------------------------------------------------------------------
diff --git a/3rdparty/docker/bootstrap/Dockerfile
b/3rdparty/docker/bootstrap/Dockerfile
index 79016b0a11..3d78a030e9 100644
--- a/3rdparty/docker/bootstrap/Dockerfile
+++ b/3rdparty/docker/bootstrap/Dockerfile
@@ -26,6 +26,8 @@ ENV
GIT_HAIKUPORTS_CROSS="https://github.com/haikuports/haikuports.cross.git";
ADD prep.sh /usr/local/bin/prep
ADD crosstools.sh /usr/local/bin/crosstools
ADD bootstrap.sh /usr/local/bin/bootstrap
+ADD haikuports_chroot.sh /usr/local/bin/haikuports_chroot
+ADD haikuports_build.sh /usr/local/bin/haikuports_build
ENV WORKPATH="/work"
ENV PATH="$PATH:$WORKPATH/bin"
diff --git a/3rdparty/docker/bootstrap/README.md
b/3rdparty/docker/bootstrap/README.md
index 5456df6911..09336f686c 100644
--- a/3rdparty/docker/bootstrap/README.md
+++ b/3rdparty/docker/bootstrap/README.md
@@ -36,5 +36,5 @@ from the end users host and create more-reproduceable
bootstrap builds.
```TARGET_ARCH=arm make bootstrap```
-5) If you need to enter the build environment, ```make enter``` will quickly
let you do so.
+5) If you need to enter the build environment, ```TARGET_ARCH=arm make
enter``` will quickly let you do so.
6) profit!
diff --git a/3rdparty/docker/bootstrap/haikuports_build.sh
b/3rdparty/docker/bootstrap/haikuports_build.sh
new file mode 100755
index 0000000000..9e18abe2be
--- /dev/null
+++ b/3rdparty/docker/bootstrap/haikuports_build.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]; then
+ echo "usage: $0 <recipe>"
+ exit 1
+fi
+
+export GENERATED=$WORKPATH/generated.$TARGET_ARCH
+export LD_LIBRARY_PATH=$GENERATED/objects/linux/lib/:$LD_LIBRARY_PATH
+
+$WORKPATH/src/haikuporter/haikuporter
--config=$GENERATED/objects/haiku/$TARGET_ARCH/packaging/repositories/HaikuPortsCross-build/haikuports.conf
\
+ --cross-devel-package
$GENERATED/objects/haiku/$TARGET_ARCH/packaging/packages/haiku_cross_devel_sysroot_stage1_$TARGET_ARCH.hpkg
$1
diff --git a/3rdparty/docker/bootstrap/haikuports_chroot.sh
b/3rdparty/docker/bootstrap/haikuports_chroot.sh
new file mode 100755
index 0000000000..23607fc0bc
--- /dev/null
+++ b/3rdparty/docker/bootstrap/haikuports_chroot.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]; then
+ echo "usage: $0 <recipe>"
+ exit 1
+fi
+
+export GENERATED=$WORKPATH/generated.$TARGET_ARCH
+export LD_LIBRARY_PATH=$GENERATED/objects/linux/lib/:$LD_LIBRARY_PATH
+
+$WORKPATH/src/haikuporter/haikuporter \
+
--config=$GENERATED/objects/haiku/$TARGET_ARCH/packaging/repositories/HaikuPortsCross-build/haikuports.conf
\
+ --cross-devel-package
$GENERATED/objects/haiku/$TARGET_ARCH/packaging/packages/haiku_cross_devel_sysroot_stage1_$TARGET_ARCH.hpkg
\
+ --enter-chroot $1
