From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 5 Jul 2018 22:28:15 +0000 (+0100)
Subject: aarch64: Remove -multi suffix from kernel
X-Git-Tag: v2.21-core123~61
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=68a36e26b1077d0baf1b57014eef64af3d7f4072

aarch64: Remove -multi suffix from kernel

This gets in the way for authoring the CD and we will
never have any other kernels but the main one.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/kernel/kernel.config.aarch64-ipfire-multi b/config/kernel/kernel.config.aarch64-ipfire
similarity index 100%
rename from config/kernel/kernel.config.aarch64-ipfire-multi
rename to config/kernel/kernel.config.aarch64-ipfire
diff --git a/make.sh b/make.sh
index cfb06fcd0e..47e1420d88 100755
--- a/make.sh
+++ b/make.sh
@@ -1093,7 +1093,7 @@ buildipfire() {
   lfsmake2 elfutils
 
   case "${BUILD_ARCH}" in
-	x86_64)
+	x86_64|aarch64)
 		lfsmake2 linux			KCFG=""
 #		lfsmake2 backports			KCFG=""
 #		lfsmake2 e1000e			KCFG=""
@@ -1137,17 +1137,6 @@ buildipfire() {
 #		lfsmake2 backports			KCFG="-multi"
 #		lfsmake2 e1000e			KCFG="-multi"
 #		lfsmake2 igb				KCFG="-multi"
-#		lfsmake2 ixgbe			KCFG="-multi"
-		lfsmake2 xtables-addons		KCFG="-multi"
-		lfsmake2 linux-initrd			KCFG="-multi"
-		;;
-
-	aarch64)
-		# arm multi platform (RPi3, OrangePi PC2 ...) kernel build
-		lfsmake2 linux			KCFG="-multi"
-#		lfsmake2 backports			KCFG="-multi"
-#		lfsmake2 e1000e			KCFG="-multi"
-#		lfsmake2 igb				KCFG="-multi"
 #		lfsmake2 ixgbe			KCFG="-multi"
 		lfsmake2 xtables-addons		KCFG="-multi"
 		lfsmake2 linux-initrd			KCFG="-multi"