diff --git a/diy-part2-x86.sh b/diy-part2-x86.sh index 79c29f1..eba7ec9 100644 --- a/diy-part2-x86.sh +++ b/diy-part2-x86.sh @@ -7,9 +7,6 @@ # Blog: https://p3terx.com #=============================================== -# 删除引起iproute2依赖编译报错的补丁 -[ -e package/libs/elfutils/patches/999-fix-odd-build-oot-kmod-fail.patch ] && rm -f package/libs/elfutils/patches/999-fix-odd-build-oot-kmod-fail.patch - # update ubus git HEAD cp -f $GITHUB_WORKSPACE/configfiles/ubus_Makefile package/system/ubus/Makefile @@ -32,11 +29,12 @@ CONFIG_PACKAGE_nginx-mod-luci=y CONFIG_PACKAGE_luci-nginx=y" >> .config -#集成CPU性能跑分脚本 +# 集成CPU性能跑分脚本 echo "CONFIG_PACKAGE_coremark=y" >> .config cp -f $GITHUB_WORKSPACE/configfiles/coremark/coremark.sh package/base-files/files/bin/coremark.sh chmod 755 package/base-files/files/bin/coremark.sh + # 定时限速插件 echo "CONFIG_PACKAGE_luci-app-eqosplus=y CONFIG_PACKAGE_luci-i18n-eqosplus-zh-cn=y" >> .config diff --git a/diy-part2.sh b/diy-part2.sh index adae0e3..805e091 100644 --- a/diy-part2.sh +++ b/diy-part2.sh @@ -7,9 +7,6 @@ # Blog: https://p3terx.com #=============================================== -# 删除引起iproute2依赖编译报错的补丁 -[ -e package/libs/elfutils/patches/999-fix-odd-build-oot-kmod-fail.patch ] && rm -f package/libs/elfutils/patches/999-fix-odd-build-oot-kmod-fail.patch - # enable rk3568 model adc keys cp -f $GITHUB_WORKSPACE/configfiles/adc-keys.txt adc-keys.txt ! grep -q 'adc-keys {' package/boot/uboot-rk35xx/src/arch/arm/dts/rk3568-easepi.dts && sed -i '/\"rockchip,rk3568\";/r adc-keys.txt' package/boot/uboot-rk35xx/src/arch/arm/dts/rk3568-easepi.dts @@ -74,8 +71,8 @@ chmod 755 package/base-files/files/etc/init.d/opwifi # 集成CPU性能跑分脚本 -cp -a $GITHUB_WORKSPACE/configfiles/coremark/* package/base-files/files/bin/ -chmod 755 package/base-files/files/bin/coremark +echo "CONFIG_PACKAGE_coremark=y" >> .config +cp -f $GITHUB_WORKSPACE/configfiles/coremark/coremark.sh package/base-files/files/bin/coremark.sh chmod 755 package/base-files/files/bin/coremark.sh