From 4b1b92e17ad8c6cd9d34eaccac4b7e79a7b90084 Mon Sep 17 00:00:00 2001 From: sbwml Date: Thu, 6 Apr 2023 19:30:39 +0800 Subject: [PATCH] archive 2023-04-06 --- openwrt/build.sh | 1 - openwrt/scripts/01-prepare_base-mainline.sh | 3 +++ tags/kernel-6.1 | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openwrt/build.sh b/openwrt/build.sh index f02b7b52f..0afc6f3c2 100644 --- a/openwrt/build.sh +++ b/openwrt/build.sh @@ -240,7 +240,6 @@ fi # waiting for repair !!! if [ "$KERNEL_VER" = "6.3" ]; then cat >> .config <<"EOF" -# CONFIG_PACKAGE_perf is not set # CONFIG_PACKAGE_kmod-dahdi is not set # CONFIG_PACKAGE_kmod-dahdi-dummy is not set # CONFIG_PACKAGE_kmod-dahdi-echocan-oslec is not set diff --git a/openwrt/scripts/01-prepare_base-mainline.sh b/openwrt/scripts/01-prepare_base-mainline.sh index 7b894da4c..12f0521a1 100644 --- a/openwrt/scripts/01-prepare_base-mainline.sh +++ b/openwrt/scripts/01-prepare_base-mainline.sh @@ -17,6 +17,9 @@ curl -s https://$mirror/openwrt/patch/KBUILD_BUILD_TIMESTAMP.patch | patch -p1 git clone https://github.com/sbwml/target_linux_generic mv target_linux_generic/target/linux/generic/* target/linux/generic/ sed -i '/CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE/d' target/linux/generic/config-6.1 target/linux/generic/config-6.3 +if [ "$soc" = "rk3399" ] || [ "$soc" = "rk3568" ] || [ "$soc" = "r5s" ]; then + sed -i 's/rtc0/rtc1/g' target/linux/generic/config-6.1 target/linux/generic/config-6.3 +fi rm -rf target_linux_generic # kernel modules diff --git a/tags/kernel-6.1 b/tags/kernel-6.1 index b29c02dde..67dfc9e19 100644 --- a/tags/kernel-6.1 +++ b/tags/kernel-6.1 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.1 = .18 -LINUX_KERNEL_HASH-6.1.18 = 842ac15eff0e6fb0c150fdf83f4f6aaf6b4c1239dcf8c14e2227620ec0ae141e +LINUX_VERSION-6.1 = .22 +LINUX_KERNEL_HASH-6.1.22 = 2be89141cef74d0e5a55540d203eb8010dfddb3c82d617e66b058f20b19cfda8