Merge remote-tracking branch 'klever1988/master' into main

biliwala · Nov 30, 2021 · 86d131a · 86d131a
2 parents e078d1a + a384e4f
commit 86d131a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -1,12 +1,11 @@
-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
 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

diff --git 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

diff --git 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
@@ -65,6 +68,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