From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 5 Oct 2015 10:43:04 +0000 (+0200)
Subject: qemu testing: Do build brctl and ifplugd; force mips32 dialect
X-Git-Tag: 1_24_0~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e6b578761a77a9b8d073b6b33a3c4e3d175a7c37;p=oweals%2Fbusybox.git

qemu testing: Do build brctl and ifplugd; force mips32 dialect

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/qemu_multiarch_testing/hdc.dir/build b/qemu_multiarch_testing/hdc.dir/build
index b7fb61fc8..a9981864a 100755
--- a/qemu_multiarch_testing/hdc.dir/build
+++ b/qemu_multiarch_testing/hdc.dir/build
@@ -15,20 +15,25 @@ test -x "bin/busybox-$HOST" && {
 (
 	#set -e -x
 	cd busybox
+
 	make defconfig
 	# Want static build
 	sed 's/^.*CONFIG_STATIC.*$/CONFIG_STATIC=y/' -i .config
-	# Drats, newer Aboriginal Linux has no bzip2
 	bzip2 </dev/null >/dev/null || {
+		# Drats, newer Aboriginal Linux has no bzip2
 		sed 's/^.*CONFIG_FEATURE_COMPRESS_USAGE.*$/# CONFIG_FEATURE_COMPRESS_USAGE is not set/' -i .config
 	}
+	test x"`uname -m`" = x"mips" && {
+		# Without this, I get MIPS-I binary instead of MIPS32.
+		# No idea what's the difference, but my router wants MIPS32.
+		sed 's/^.*CONFIG_EXTRA_CFLAGS.*$/CONFIG_EXTRA_CFLAGS="-mips32"/' -i .config
+	}
 	# These won't build because of toolchain/libc breakage:
 	sed 's/^.*CONFIG_FEATURE_SYNC_FANCY.*$/# CONFIG_FEATURE_SYNC_FANCY is not set/' -i .config # no syncfs()
 	sed 's/^.*CONFIG_FEATURE_WTMP.*$/# CONFIG_FEATURE_WTMP is not set/' -i .config
 	sed 's/^.*CONFIG_FEATURE_UTMP.*$/# CONFIG_FEATURE_UTMP is not set/' -i .config
 	sed 's/^.*CONFIG_FEATURE_INETD_RPC.*$/# CONFIG_FEATURE_INETD_RPC is not set/' -i .config
-	sed 's/^.*CONFIG_BRCTL.*$/# CONFIG_BRCTL is not set/' -i .config
-	sed 's/^.*CONFIG_IFPLUGD.*$/# CONFIG_IFPLUGD is not set/' -i .config
+
 	make #V=1 || sh
 	size busybox
 	./busybox || echo "Exit code: $?"