commit 75cd325f5446220c1869f67686dd54787717756e
parent fc273cd54b47c48d220967eae402c6418de7603a
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Sun, 3 Jan 2021 02:16:00 +0100
Builds, busybox binary not reproducible due to embedded build timestamp
Diffstat:
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
local
-image
+*-image
diff --git a/build b/build
@@ -9,8 +9,11 @@ fi
awk -vPWD="$PWD" '{gsub(/@@PWD@@/,PWD); print}' musl-cross-make.config.mak >musl-cross-make/config.mak.new || exit $?
mv musl-cross-make/config.mak.new musl-cross-make/config.mak || exit $?
make -C musl-cross-make -j$JOBS -l$JOBS || exit $?
+make -C musl-cross-make install || exit $?
awk -vPWD="$PWD" -vJOBS="$JOBS" '{gsub(/@@PWD@@/,PWD); gsub(/@@JOBS@@/,JOBS); print}' sabotage.config >sabotage/config.new || exit $?
mv sabotage/config.new sabotage/config || exit $?
PATH=$PWD/sabotage/KEEP/bin:$PWD/local/bin:$PWD/local/x86_64-linux-musl/bin:$PATH
export CONFIG=$PWD/sabotage/config
+mkdir -p sabotage-image || exit $?
+sabotage/utils/setup-rootfs.sh || exit $?
butch install busybox lvm cryptsetup
diff --git a/musl-cross-make.config.mak b/musl-cross-make.config.mak
@@ -21,7 +21,7 @@ TARGET = x86_64-linux-musl
# OUTPUT = /opt/cross
# OUTPUT = /usr/local
-OUTPUT = "@@PWD@@/prefix"
+OUTPUT = "@@PWD@@/local"
# By default, latest supported release versions of musl and the toolchain
# components are used. You can override those here, but the version selected
diff --git a/sabotage.config b/sabotage.config
@@ -31,7 +31,7 @@ triplet=$A-linux-musl
export S="@@PWD@@/sabotage"
# set R to the rootfs path (where stuff gets installed to)
-export R="@@PWD@@/image"
+export R="@@PWD@@/sabotage-image"
# set number of parallel make processes
export MAKE_THREADS=@@JOBS@@