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

3rdparty/docker/bootstrap: Fix bootstrap container

Browse Source 
* Update for newer git (init -b support)
* Fix configure args for new cross-tools-source

Change-Id: I757a1a48affb8cd98ddd8a0890393bdb6bc2a81f
This commit is contained in:
Alexander von Gluck IV
2021-12-12 14:24:21 -06:00
parent 8ca0f03d0c
commit 4c8e85b316
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/docker/bootstrap/Dockerfile
Vendored
+3 -3
View File
@@ -1,4 +1,4 @@
FROM debian:buster-slim FROM debian:bullseye-slim
ENV DEBIAN_FRONTEND="noninteractive" ENV DEBIAN_FRONTEND="noninteractive"
@@ -7,8 +7,8 @@ RUN apt-get update
# Base Haiku requirements # Base Haiku requirements
RUN apt-get install -y git nasm autoconf automake autopoint texinfo \ RUN apt-get install -y git nasm autoconf automake autopoint texinfo \
flex bison gawk build-essential unzip wget zip less zlib1g-dev \ flex bison gawk build-essential unzip wget zip less zlib1g-dev \
libcurl4-openssl-dev genisoimage libtool mtools gcc-multilib \ libzstd-dev libcurl4-openssl-dev genisoimage libtool \
u-boot-tools util-linux device-tree-compiler bc mtools gcc-multilib u-boot-tools util-linux device-tree-compiler bc
# GCC requirements # GCC requirements
RUN apt-get install -y python3 RUN apt-get install -y python3
3rdparty/docker/bootstrap/crosstools.sh
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ mkdir -p $GENERATED
echo "Beginning a bootstrap build for $TARGET_ARCH at $GENERATED..." echo "Beginning a bootstrap build for $TARGET_ARCH at $GENERATED..."
cd $GENERATED cd $GENERATED
$WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH $WORKPATH/src/buildtools \ $WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH --cross-tools-source $WORKPATH/src/buildtools \
--bootstrap $WORKPATH/src/haikuporter/haikuporter $WORKPATH/src/haikuports.cross $WORKPATH/src/haikuports --bootstrap $WORKPATH/src/haikuporter/haikuporter $WORKPATH/src/haikuports.cross $WORKPATH/src/haikuports
echo "If everything was successful, your next step is 'TARGET_ARCH=$TARGET_ARCH make bootstrap'" echo "If everything was successful, your next step is 'TARGET_ARCH=$TARGET_ARCH make bootstrap'"