update_kernel.sh: fix unified version file updates
authorRui Salvaterra <rsalvaterra@gmail.com>
Tue, 8 Feb 2022 13:17:03 +0000 (13:17 +0000)
committerRui Salvaterra <rsalvaterra@gmail.com>
Wed, 9 Feb 2022 08:45:05 +0000 (08:45 +0000)
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>
update_kernel.sh

index 2c4bb09469f89bd3cbfebb67d1dd999236dd81d0..a74f91d749e56767efede5dcd9bc2cd265171a47 100755 (executable)
@@ -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