From 23617de782542348cf8258520724adaa150683d7 Mon Sep 17 00:00:00 2001
From: Jannis <52237708+heisath@users.noreply.github.com>
Date: Sat, 29 May 2021 10:22:19 +0200
Subject: [PATCH] Update build.sh

Fix for rebuilding modules which renames lib/modules subfolder to xx.yy.zz+
---
 build.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index a5ab781..0bc6001 100755
--- a/build.sh
+++ b/build.sh
@@ -262,8 +262,13 @@ build_kernel()
 
     kernel_version=$(grab_version "${kernel_dir}");
     
-    # cleanup old modules for this kernel
-    rm -r "${output_dir}"/lib/modules/"$kernel_version"
+    # cleanup old modules for this kernel, this helps when rebuilding kernel with less modules
+    if [ -d "${output_dir}"/lib/modules/"${kernel_version}" ]; then
+    	rm -r "${output_dir}"/lib/modules/"$kernel_version"
+    elif [ -d "${output_dir}"/lib/modules/"${kernel_version}"+ ]; then
+    	rm -r "${output_dir}"/lib/modules/"$kernel_version"+
+    fi
+    
     
     # cd into linux source
     cd "${kernel_dir}"
@@ -302,7 +307,13 @@ build_kernel()
 
     # tar and compress modules for easier transport
     cd "${output_dir}"/lib/modules/
-    tar -czf "${output_dir}"/modules-${kernel_version}.tar.gz "${kernel_version}"
+    if [ -d "${kernel_version}" ]; then
+    	tar -czf "${output_dir}"/modules-${kernel_version}.tar.gz "${kernel_version}"
+    elif [ -d "${kernel_version}"+ ]; then
+    	tar -czf "${output_dir}"/modules-${kernel_version}+.tar.gz "${kernel_version}"+
+    else
+    	echo "### Failed to tar up modules folder! It might be missing from the output."
+    fi
 
     cd "${output_dir}"
     tar -czf "${output_dir}"/boot-${kernel_version}.tar.gz boot/uRamdisk boot/uImage-${kernel_version} boot/uImage boot/linux-${kernel_version}.config