From 8fdab88e7354f5b22cbb93e3df7e7734ed40a135 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 19 Nov 2021 19:57:06 +0800 Subject: [PATCH 1/5] fix x86 --- scripts/patches.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/patches.sh b/scripts/patches.sh index 6ab12f4b65..abffdf8f77 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -24,9 +24,12 @@ sed -i 's/5.0/1.0/' .ccache/ccache.conf || true 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 From dafb6ece97777436eddf1809f8d1c708eab35159 Mon Sep 17 00:00:00 2001 From: John Doe Date: Sat, 20 Nov 2021 09:03:27 +0800 Subject: [PATCH 2/5] package: re-add linkease --- common.seed | 1 + extra_packages.seed | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/common.seed b/common.seed index 2713a6714a..fde5d7437e 100644 --- a/common.seed +++ b/common.seed @@ -27,6 +27,7 @@ CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-jd-dailybonus=y CONFIG_PACKAGE_luci-app-ksmbd=y +CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-mosdns=y CONFIG_PACKAGE_luci-app-openvpn=y CONFIG_PACKAGE_luci-app-serverchan=y diff --git a/extra_packages.seed b/extra_packages.seed index 05284550ea..72f607c969 100644 --- a/extra_packages.seed +++ b/extra_packages.seed @@ -6,7 +6,6 @@ CONFIG_PACKAGE_kmod-usb3=m CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=m CONFIG_PACKAGE_kmod-usb-net-rndis=m CONFIG_PACKAGE_ksmbd-utils=m -CONFIG_PACKAGE_luci-app-linkease=m CONFIG_PACKAGE_luci-app-openvpn=m CONFIG_PACKAGE_luci-app-udpxy=m CONFIG_PACKAGE_luci-app-vssr=m From c75f1c6ba85d368caa014658180f0cb419dcc74f Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 22 Nov 2021 08:12:10 +0800 Subject: [PATCH 3/5] build: fix pwm fan control --- scripts/patches.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/patches.sh b/scripts/patches.sh index abffdf8f77..978b91c934 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -67,6 +67,7 @@ if [ $BRANCH == 'master' ]; then wget https://github.com/friendlyarm/friendlywrt/commit/cebdc1f94dcd6363da3a5d7e1e69fd741b8b718e.patch git apply cebdc1f94dcd6363da3a5d7e1e69fd741b8b718e.patch 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 #this is a ugly fix sed -i '/procd-ujail/d' include/target.mk From f5c58675c7a43b11f3192547fdd2783473dac9d5 Mon Sep 17 00:00:00 2001 From: John Doe Date: Sat, 27 Nov 2021 03:45:56 +0800 Subject: [PATCH 4/5] package: fix name --- scripts/merge_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh index 533c23d5d6..eb58c57f41 100644 --- a/scripts/merge_packages.sh +++ b/scripts/merge_packages.sh @@ -32,7 +32,7 @@ merge_package https://github.com/klever1988/helloworld/branches/tmp/luci-app-ssr 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-services-wolplus +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/uugamebooster From a384e4ffcb9060e6b2c03ca9946551a080b1f26c Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 29 Nov 2021 20:22:15 +0800 Subject: [PATCH 5/5] Build: fix --- extra_packages.seed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra_packages.seed b/extra_packages.seed index 72f607c969..53035aaa51 100644 --- a/extra_packages.seed +++ b/extra_packages.seed @@ -1,4 +1,4 @@ -CONFIG_DEFAULT_SETTINGS_OPTIMIZE_FOR_CHINESE=y +CONFIG_PACKAGE_default-settings-chn=y CONFIG_PACKAGE_kmod-ebtables-ipv6=m CONFIG_PACKAGE_kmod-ipt-raw6=m CONFIG_PACKAGE_kmod-usb2=m