diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 2ba8b06..5d8cf6c 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -66,8 +66,8 @@ jobs: fi ./scripts/feeds update -a ./scripts/feeds install -a - . $GITHUB_WORKSPACE/patches.sh . $GITHUB_WORKSPACE/merge_packages.sh + . $GITHUB_WORKSPACE/patches.sh cd svn export https://github.com/openwrt/luci/branches/openwrt-18.06 luci echo > more_luci.txt diff --git a/merge_packages.sh b/merge_packages.sh index 849ffe7..13c2987 100644 --- a/merge_packages.sh +++ b/merge_packages.sh @@ -19,7 +19,3 @@ merge_package https://github.com/project-lede/luci-app-godproxy merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-cifsd luci-app-ksmbd merge_package https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools - -if [ $DEVICE = 'r2s' ]; then - sed -i "s/enable '0'/enable '1'/" `find feeds/ -type f -name oled | grep config` -fi diff --git a/patches.sh b/patches.sh index 09ef201..db69d19 100644 --- a/patches.sh +++ b/patches.sh @@ -1,9 +1,3 @@ -sed -i 's/1400000/1450000/' target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch -truncate -s-1 package/lean/luci-app-cpufreq/root/etc/config/cpufreq -echo -e "\toption governor0 'schedutil'" >> package/lean/luci-app-cpufreq/root/etc/config/cpufreq -echo -e "\toption minfreq0 '816000'" >> package/lean/luci-app-cpufreq/root/etc/config/cpufreq -echo -e "\toption maxfreq0 '1512000'\n" >> package/lean/luci-app-cpufreq/root/etc/config/cpufreq - sed -i "s/option hw_flow '1'/option hw_flow '0'/" package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc sed -i "s/option sfe_flow '1'/option sfe_flow '0'/" package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc sed -i "s/option sfe_bridge '1'/option sfe_bridge '0'/" package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc @@ -16,6 +10,15 @@ sed -i 's/192.168.1.1/192.168.2.1/' package/base-files/files/bin/config_generate sed -i '/DEPENDS/ s/$/ +libcap-bin/' `find . -type f -path '*/luci-app-openclash/Makefile'` sed -i '/DEPENDS+/ s/$/ +wsdd2/' `find . -type f -path '*/ksmbd-tools/Makefile'` +if [ $DEVICE = 'r2s' ]; then + sed -i "s/enable '0'/enable '1'/" `find feeds/ -type f -name oled | grep config` + sed -i 's/1400000/1450000/' target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch + truncate -s-1 package/lean/luci-app-cpufreq/root/etc/config/cpufreq + echo -e "\toption governor0 'schedutil'" >> package/lean/luci-app-cpufreq/root/etc/config/cpufreq + echo -e "\toption minfreq0 '816000'" >> package/lean/luci-app-cpufreq/root/etc/config/cpufreq + echo -e "\toption maxfreq0 '1512000'\n" >> package/lean/luci-app-cpufreq/root/etc/config/cpufreq +fi + if [ $DEVICE = 'r4s' ]; then wget https://github.com/immortalwrt/immortalwrt/commit/6c3f6d2686679173b95495c47d861db1f41729dd.patch sed -i 's/ctcgfw/kernel/g' 6c3f6d2686679173b95495c47d861db1f41729dd.patch