From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 8 Nov 2024 18:14:16 +0000 (+1100)
Subject: Reshuffle OpenWRT test configs.
X-Git-Tag: V_10_0_P1~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a80eb71c428c474098087c672398f200be8fabdf;p=thirdparty%2Fopenssh-portable.git

Reshuffle OpenWRT test configs.

Move the the flags used by the OpenWRT distro to mipsel target and
enable OpenSSL on all targets to improve coverage.

Explicitly disable security key and openssl on mips target so that host
end of the bigendian interop tests don't attempt them and fail (since
they're not enabled on the target side).
---

diff --git a/.github/configs b/.github/configs
index 136357d95..78f724997 100755
--- a/.github/configs
+++ b/.github/configs
@@ -296,18 +296,22 @@ case "${TARGET_HOST}" in
 	# SHA256 functions in sha2.h conflict with OpenSSL's breaking sk-dummy
 	CONFIGFLAGS="${CONFIGFLAGS} --without-hardening --disable-security-key"
 	;;
-    openwrt-*)
-	CONFIGFLAGS="${CONFIGFLAGS} --without-zlib"
-	LIBCRYPTOFLAGS="--without-openssl"
-	TEST_TARGET="t-exec"
-	;;
-    openwrt-mips)
+    openwrt-mipsel)
 	# Test most of the flags that OpenWRT sets for their package build.
 	# We only do this on one OpenWRT target for better coverage.
+	# The installed shared libraries installed by default are stripped and
+	# can't be linked to on the target systems.
 	OPENWRT_FLAGS="--disable-strip --disable-lastlog
 	   --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx
 	   --with-stackprotect --with-cflags-after=-fzero-call-used-regs=skip"
-	CONFIGFLAGS="${CONFIGFLAGS} $(echo ${OPENWRT_FLAGS})"
+	CONFIGFLAGS="${CONFIGFLAGS} $(echo ${OPENWRT_FLAGS}) --without-zlib --disable-security-key"
+	LIBCRYPTOFLAGS="--without-openssl"
+	TEST_TARGET="t-exec"
+	;;
+    openwrt-*)
+	CONFIGFLAGS="${CONFIGFLAGS} --without-zlib --disable-security-key"
+	LIBCRYPTOFLAGS="--without-openssl"
+	TEST_TARGET="t-exec"
 	;;
     sol10|sol11)
 	# sol10 VM is 32bit and the unit tests are slow.