From d06083c96dfae655880f50fdc40fc4c51ae35850 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@tele2.at>
Date: Fri, 19 Oct 2018 20:42:09 +0200
Subject: [PATCH] Propperly process Linux package targets in deploy function

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
---
 pkg/linux/build | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkg/linux/build b/pkg/linux/build
index 9d8e462..5c0722b 100755
--- a/pkg/linux/build
+++ b/pkg/linux/build
@@ -50,19 +50,26 @@ deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
 	local LINUX_CPU=$(get_linux_cpu)
+	local target
 
 	mkdir -p "$DEPLOY/boot" "$DEPLOY/lib/modules"
-	cp arch/${LINUX_CPU}/boot/*Image "$DEPLOY/boot/vmlinuz"
-	echo "boot/vmlinuz m 555 0 0" > "$DEPLOY/rootfs_files.txt"
 
-	if grep -q "^CONFIG_MODULES=" ".config"; then
-		export KBUILD_OUTPUT="$PKGBUILDDIR"
-		make -C "$SOURCE" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" INSTALL_MOD_PATH="$DEPLOY" modules_install
+	for target in $LINUX_TGT; do
+		case $target in
+		*Image)
+			cp "arch/$LINUX_CPU/boot/$target" "$DEPLOY/boot/vmlinuz"
+			echo "boot/vmlinuz m 555 0 0" > "$DEPLOY/rootfs_files.txt"
+			;;
+		modules)
+			export KBUILD_OUTPUT="$PKGBUILDDIR"
+			make -C "$SOURCE" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" INSTALL_MOD_PATH="$DEPLOY" modules_install
 
-		find "$DEPLOY/lib" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
-			sed "s#^$DEPLOY/##g" | sed "s/644/444/g" | \
-			sed "s/755/555/g" >> "$DEPLOY/rootfs_files.txt"
-	fi
+			find "$DEPLOY/lib" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
+				sed "s#^$DEPLOY/##g" | sed "s/644/444/g" | \
+				sed "s/755/555/g" >> "$DEPLOY/rootfs_files.txt"
+			;;
+		esac
+	done
 }
 
 check_update() {