From: Rui Salvaterra <rsalvaterra@gmail.com>
Date: Tue, 8 Feb 2022 13:17:03 +0000 (+0000)
Subject: update_kernel.sh: fix unified version file updates
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=727faee6d0e640c358f1f9f09794d1428c3c82b6;p=maintainer-tools.git

update_kernel.sh: fix unified version file updates

The previous commit broke the kernel-version.mk automated update, since the
kernel version files are now split. However, older branches still use the
unified file, so compatibility must be kept.

Check for the presence of the kernel version-specific file. If it doesn't exist,
assume we're using the unified file and do the version update accordingly.

Fixes: cbb9d08 ("update_kernel.sh: update it to new kernel hash/version file way")

Tested-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
---

diff --git a/update_kernel.sh b/update_kernel.sh
index 2c4bb09..a74f91d 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -155,7 +155,15 @@ if [ "$UPDATE" -eq 1 ]; then
 		CHECKSUM=$(./staging_dir/host/bin/mkhash sha256 dl/linux-$PATCHVER.tar.xz)
 	fi
 
-	$CMD ./staging_dir/host/bin/sed -i include/kernel-${KERNEL} \
+	if [ -f include/kernel-${KERNEL} ]; then
+		# split version files
+		KERNEL_VERSION_FILE=include/kernel-${KERNEL}
+	else
+		# unified version file
+		KERNEL_VERSION_FILE=include/kernel-version.mk
+	fi
+
+	$CMD ./staging_dir/host/bin/sed -i ${KERNEL_VERSION_FILE} \
 		-e "s|LINUX_VERSION-${KERNEL} =.*|LINUX_VERSION-${KERNEL} = ${NEWVER}|" \
 		-e "s|LINUX_KERNEL_HASH-${KERNEL}.*|LINUX_KERNEL_HASH-${PATCHVER} = ${CHECKSUM}|"
 fi