From 50cfb9c7579988241566948ed77494410e4678aa Mon Sep 17 00:00:00 2001 From: John Doe Date: Wed, 29 Dec 2021 03:17:17 +0800 Subject: [PATCH] Kernel: upgrade to 5.10 --- .github/workflows/lo-test.yml | 1 + scripts/merge_packages.sh | 5 +++-- scripts/patches.sh | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 01c5603..48ae314 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -98,6 +98,7 @@ jobs: make package/clean df -h . - name: Build and deploy packages + timeout-minutes: 1440 run: | ulimit -SHn 65000 cd ~/lede diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh index eb58c57..73310b6 100644 --- a/scripts/merge_packages.sh +++ b/scripts/merge_packages.sh @@ -33,8 +33,9 @@ merge_package https://github.com/klever1988/helloworld/branches/tmp/mosdns #merge_package https://github.com/klever1988/openwrt-mos/trunk/luci-app-mosdns merge_package https://github.com/project-lede/luci-app-godproxy merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-wolplus -merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3-mount -merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3 +merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/automount +merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3-oot-mount +merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3-oot merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/uugamebooster merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-uugamebooster merge_package https://github.com/kuoruan/openwrt-frp frp diff --git a/scripts/patches.sh b/scripts/patches.sh index 81b4553..76840e1 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -26,14 +26,13 @@ if [ $BRANCH == 'master' ]; then git checkout target/linux/rockchip git checkout target/linux/x86 - sed -i 's/5.10/5.4/' target/linux/rockchip/Makefile git revert --no-commit -X theirs 91eed5d9fb74e6c740291362ba12e11a2222a9fd echo '# CONFIG_KCSAN is not set' >> target/linux/x86/config-5.10 echo '# CONFIG_CRYPTO_GHASH_ARM_CE is not set' >> target/linux/sunxi/cortexa7/config-5.10 echo '# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set' >> target/linux/sunxi/cortexa7/config-5.10 echo '# CONFIG_SUN50I_IOMMU is not set' >> target/linux/sunxi/cortexa7/config-5.10 - echo '# CONFIG_UCLAMP_TASK is not set' >> target/linux/sunxi/config-5.4 + echo '# CONFIG_UCLAMP_TASK is not set' >> target/linux/sunxi/config-5.10 sed -i '/LINUX_5_4/d' package/kernel/r8168/Makefile # fix po path for snapshot @@ -49,7 +48,7 @@ if [ $BRANCH == 'master' ]; then sed -i 's/r8169/r8168/' target/linux/rockchip/image/armv8.mk # change the voltage value for over-clock stablization - sed -i 's/1400000/1450000/' target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch + sed -i 's/1400000/1450000/' target/linux/rockchip/patches-5.10/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch config_file_cpufreq=`find package/ -follow -type f -path '*/luci-app-cpufreq/root/etc/config/cpufreq'` truncate -s-1 $config_file_cpufreq echo -e "\toption governor0 'schedutil'" >> $config_file_cpufreq @@ -60,6 +59,7 @@ if [ $BRANCH == 'master' ]; then # enable the gpu for device 'r2s'|'r2c'|'r4s'|'r1p' wget https://github.com/coolsnowwolf/lede/raw/757e42d70727fe6b937bb31794a9ad4f5ce98081/target/linux/rockchip/config-default -NP target/linux/rockchip/ wget https://github.com/coolsnowwolf/lede/commit/f341ef96fe4b509a728ba1281281da96bac23673.patch + sed -i 's/config-5.4/config-5.10/g' f341ef96fe4b509a728ba1281281da96bac23673.patch git apply f341ef96fe4b509a728ba1281281da96bac23673.patch rm f341ef96fe4b509a728ba1281281da96bac23673.patch @@ -69,6 +69,11 @@ if [ $BRANCH == 'master' ]; then rm cebdc1f94dcd6363da3a5d7e1e69fd741b8b718e.patch sed -i 's/pwmchip1/pwmchip0/' target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh + # add ntfs3 + wget https://github.com/coolsnowwolf/lede/commit/772c5d2c8beac50ed5140c3d494f0806c64edc29.patch + git apply 772c5d2c8beac50ed5140c3d494f0806c64edc29.patch + rm 772c5d2c8beac50ed5140c3d494f0806c64edc29.patch + #this is a ugly fix sed -i '/procd-ujail/d' include/target.mk echo 'CONFIG_PACKAGE_procd-seccomp=y' >> $GITHUB_WORKSPACE/common.seed