From cd74009293c2128e89b2c972d402febcda8f4a56 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@tele2.at>
Date: Sun, 15 Jul 2018 17:17:01 +0200
Subject: [PATCH] Merge linux_modules package into linux package

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
---
 board/alix/ROOTFS       |  1 -
 board/rpi3/ROOTFS       |  1 -
 pkg/linux-rpi3/build    | 11 +++++++++--
 pkg/linux/build         | 10 +++++++++-
 pkg/linux_modules/build | 28 ----------------------------
 5 files changed, 18 insertions(+), 33 deletions(-)
 delete mode 100755 pkg/linux_modules/build

diff --git a/board/alix/ROOTFS b/board/alix/ROOTFS
index 7020041..2736b09 100644
--- a/board/alix/ROOTFS
+++ b/board/alix/ROOTFS
@@ -1,4 +1,3 @@
-linux_modules
 kmod
 inetutils
 ethtool
diff --git a/board/rpi3/ROOTFS b/board/rpi3/ROOTFS
index 902b63d..e1d31ff 100644
--- a/board/rpi3/ROOTFS
+++ b/board/rpi3/ROOTFS
@@ -1,4 +1,3 @@
-linux_modules
 kmod
 inetutils
 ethtool
diff --git a/pkg/linux-rpi3/build b/pkg/linux-rpi3/build
index e218c90..ecbe549 100755
--- a/pkg/linux-rpi3/build
+++ b/pkg/linux-rpi3/build
@@ -23,17 +23,24 @@ build() {
 	sed -i "$PKGBUILDDIR/.config" -e 's,^CONFIG_CROSS_COMPILE=.*,CONFIG_CROSS_COMPILE="'$TARGET'-",'
 	sed -i "$PKGBUILDDIR/.config" -e 's,^CONFIG_INITRAMFS_SOURCE=.*,CONFIG_INITRAMFS_SOURCE="'$INITRDLIST'",'
 	sed -i "$PKGBUILDDIR/.config" -e 's,^CONFIG_LOCALVERSION=.*,CONFIG_LOCALVERSION="-'${OS_NAME}-${OS_RELEASE}'",'
-	make -C "$1" O="$PKGBUILDDIR" ARCH="arm" CROSS_COMPILE="${TARGET}-" -j $NUMJOBS zImage dtbs
+	make -C "$1" O="$PKGBUILDDIR" ARCH="arm" CROSS_COMPILE="${TARGET}-" -j $NUMJOBS zImage dtbs modules
 }
 
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
 
-	mkdir -p "$DEPLOY/boot"
+	mkdir -p "$DEPLOY/boot" "$DEPLOY/lib/modules"
 	cp "arch/arm/boot/zImage" "$DEPLOY/boot/vmlinuz"
 
+	export KBUILD_OUTPUT="$PKGBUILDDIR"
+	make -C "$SOURCE" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" INSTALL_MOD_PATH="$DEPLOY" modules_install
+
 	echo "boot/vmlinuz m 555 0 0" > "$DEPLOY/rootfs_files.txt"
+
+	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"
 }
 
 check_update() {
diff --git a/pkg/linux/build b/pkg/linux/build
index b9df17b..5a93004 100755
--- a/pkg/linux/build
+++ b/pkg/linux/build
@@ -26,16 +26,24 @@ build() {
 	sed -i "$PKGBUILDDIR/.config" -e 's,^CONFIG_INITRAMFS_SOURCE=.*,CONFIG_INITRAMFS_SOURCE="'$INITRDLIST'",'
 	sed -i "$PKGBUILDDIR/.config" -e 's,^CONFIG_LOCALVERSION=.*,CONFIG_LOCALVERSION="-'${OS_NAME}-${OS_RELEASE}'",'
 	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" -j $NUMJOBS $LINUX_TGT
+	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" -j $NUMJOBS modules
 }
 
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
 
-	mkdir -p "$DEPLOY/boot"
+	mkdir -p "$DEPLOY/boot" "$DEPLOY/lib/modules"
 	cp "arch/$LINUX_CPU/boot/$LINUX_TGT" "$DEPLOY/boot/vmlinuz"
 
+	export KBUILD_OUTPUT="$PKGBUILDDIR"
+	make -C "$SOURCE" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" INSTALL_MOD_PATH="$DEPLOY" modules_install
+
 	echo "boot/vmlinuz m 555 0 0" > "$DEPLOY/rootfs_files.txt"
+
+	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"
 }
 
 check_update() {
diff --git a/pkg/linux_modules/build b/pkg/linux_modules/build
deleted file mode 100755
index 9467f6f..0000000
--- a/pkg/linux_modules/build
+++ /dev/null
@@ -1,28 +0,0 @@
-# inherit package details from kernel package
-source "$SCRIPTDIR/pkg/$LINUXPKG/build"
-DEPENDS="toolchain"
-
-build() {
-	export KBUILD_OUTPUT="$PKGBUILDDIR"
-	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" mrproper
-	cat_file_override "linux.config" > "$PKGBUILDDIR/.config"
-
-	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" oldconfig
-	sed -i "$PKGBUILDDIR/.config" -e 's,^CONFIG_CROSS_COMPILE=.*,CONFIG_CROSS_COMPILE="'$TARGET'-",'
-	sed -i "$PKGBUILDDIR/.config" -e 's,^CONFIG_LOCALVERSION=.*,CONFIG_LOCALVERSION="-'${OS_NAME}-${OS_RELEASE}'",'
-	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" -j $NUMJOBS modules
-}
-
-deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	mkdir -p "$DEPLOY/lib/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"
-}