From d17a65699fbef1b178241c59414b16d6a99c42bd Mon Sep 17 00:00:00 2001 From: JohnsonRan Date: Sat, 21 Dec 2024 17:50:58 +0800 Subject: [PATCH] linux-6.12: bump to 6.12.6 --- openwrt/scripts/01-prepare_base-mainline.sh | 2 +- tags/kernel-6.12 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openwrt/scripts/01-prepare_base-mainline.sh b/openwrt/scripts/01-prepare_base-mainline.sh index 0c715ecd6..f75dcbeb7 100644 --- a/openwrt/scripts/01-prepare_base-mainline.sh +++ b/openwrt/scripts/01-prepare_base-mainline.sh @@ -44,7 +44,7 @@ grep HASH include/kernel-6.12 | awk -F'HASH-' '{print $2}' | awk '{print $1}' | # kernel generic patches curl -s $mirror/openwrt/patch/kernel-6.12/openwrt/linux-6.12-target-linux-generic.patch | patch -p1 local_kernel_version=$(sed -n 's/^LINUX_KERNEL_HASH-\([0-9.]\+\) = .*/\1/p' include/kernel-6.12) -release_kernel_version=$(curl -sL https://raw.githubusercontent.com/sbwml/r4s_build_script/master/tags/kernel-6.12 | sed -n 's/^LINUX_KERNEL_HASH-\([0-9.]\+\) = .*/\1/p') +release_kernel_version=$(curl -sL https://raw.githubusercontent.com/JohnsonRan/opwrt_build_script/master/tags/kernel-6.12 | sed -n 's/^LINUX_KERNEL_HASH-\([0-9.]\+\) = .*/\1/p') if [ "$local_kernel_version" = "$release_kernel_version" ] && [ -z "$git_password" ] && [ "$(whoami)" != "sbwml" ]; then git clone https://$github/sbwml/target_linux_generic -b openwrt-24.10 target/linux/generic-6.12 --depth=1 else diff --git a/tags/kernel-6.12 b/tags/kernel-6.12 index 3f2cd757d..1e17fc37c 100644 --- a/tags/kernel-6.12 +++ b/tags/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = .5 -LINUX_KERNEL_HASH-6.12.5 = 39207fce1ce42838e085261bae0af5ce4a0843aa777cfc0f5c49bc7729602bcd +LINUX_VERSION-6.12 = .6 +LINUX_KERNEL_HASH-6.12.6 = d450ab215de4e1f8bb85e0f4216760fa33fd024b4526b144f4ce0d9012b29c9e