From 67ce5b6e50b703550d32d15b2df395921e2e987f Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 30 Nov 2021 03:22:52 -0600 Subject: [PATCH] mkroot isn't setting CROSS_BASE anymore, so have the consumer do it. --- scripts/root/dropbear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/root/dropbear b/scripts/root/dropbear index a2a49ddc..c6fd779a 100755 --- a/scripts/root/dropbear +++ b/scripts/root/dropbear @@ -28,7 +28,7 @@ setupfor dropbear echo 'echo "$@"' > config.sub && ZLIB="$(echo ../zlib*)" && CFLAGS="-I $ZLIB -O2" LDFLAGS="-L $ZLIB" ./configure --enable-static \ - --disable-wtmp --host=${CROSS_BASE%-} && + --disable-wtmp --host="$(basename "$CROSS_COMPILE" | sed 's/-$//')" && sed -i 's@/usr/bin/dbclient@ssh@' options.h && sed -i 's@\(#define NON_INETD_MODE\) 1@\1 0@' default_options.h && make -j $(nproc) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" MULTI=1 SCPPROGRESS=1 && -- 2.39.2