From c2abc252e2c05382c98d6ca989993441879896d9 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Sep 2020 09:18:54 +0800 Subject: [PATCH] add nft-qos --- .github/workflows/r2s_lean_minimal-dev.yml | 6 +- app_config.seed | 1 + enable_autocore_ctcgfw_master.diff | 66 ++++++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 enable_autocore_ctcgfw_master.diff diff --git a/.github/workflows/r2s_lean_minimal-dev.yml b/.github/workflows/r2s_lean_minimal-dev.yml index d033626..e4553ed 100644 --- a/.github/workflows/r2s_lean_minimal-dev.yml +++ b/.github/workflows/r2s_lean_minimal-dev.yml @@ -43,17 +43,17 @@ jobs: cd friendlywrt git remote add upstream https://github.com/project-openwrt/openwrt && git fetch upstream - git checkout upstream/openwrt-19.07 -b tmp + git checkout upstream/openwrt-18.06 -b tmp git mv README.md README git commit -m 'reset' git checkout master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch - git checkout upstream/openwrt-19.07 -- feeds.conf.default + git checkout upstream/openwrt-18.06 -- feeds.conf.default cd package/ctcgfw/ rm -rf luci-app-oled/ && git clone https://github.com/NateLol/luci-app-oled cd ../../ - git apply ../../enable_autocore_ctcgfw.diff + git apply ../../enable_autocore_ctcgfw_master.diff sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings diff --git a/app_config.seed b/app_config.seed index 4df4603..8f46df6 100644 --- a/app_config.seed +++ b/app_config.seed @@ -37,6 +37,7 @@ CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-openvpn-server=y CONFIG_PACKAGE_luci-app-opkg=y CONFIG_PACKAGE_luci-app-pptp-server=y +CONFIG_PACKAGE_luci-app-nft-qos=y CONFIG_PACKAGE_luci-app-samba=y CONFIG_PACKAGE_luci-app-softethervpn=y CONFIG_PACKAGE_luci-app-sqm=y diff --git a/enable_autocore_ctcgfw_master.diff b/enable_autocore_ctcgfw_master.diff new file mode 100644 index 0000000..0b05938 --- /dev/null +++ b/enable_autocore_ctcgfw_master.diff @@ -0,0 +1,66 @@ +diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile +index b10064ba..2b702480 100644 +--- a/package/lean/autocore/Makefile ++++ b/package/lean/autocore/Makefile +@@ -25,7 +25,7 @@ endef + define Package/autocore-x86 + TITLE:=x86/x64 auto core loadbalance script. + MAINTAINER:=Lean +- DEPENDS:=@TARGET_x86 +bc +lm-sensors +ethtool ++ DEPENDS:=+bc +lm-sensors +ethtool + VARIANT:=x86 + endef + +diff --git a/package/lean/autocore/files/x86/autocore b/package/lean/autocore/files/x86/autocore +index 614e2176..5ca9d6cb 100755 +--- a/package/lean/autocore/files/x86/autocore ++++ b/package/lean/autocore/files/x86/autocore +@@ -1,5 +1,4 @@ +-#!/bin/sh /etc/rc.common +-# Copyright (C) 2017 lean ++ + + START=99 + +@@ -31,7 +30,7 @@ start() + g=${a}${b}${c}${d}${e}${f} + + mkdir -p /tmp/sysinfo +- echo $g > /tmp/sysinfo/model ++ #echo $g > /tmp/sysinfo/model + + a=$(ip address | grep ^[0-9] | awk -F: '{print $2}' | sed "s/ //g" | grep '^[e]' | grep -v "@" | grep -v "\.") + b=$(echo "$a" | wc -l) +@@ -42,7 +41,7 @@ start() + ethtool -K $c tx-checksum-ip-generic on >/dev/null 2>&1 || ( + ethtool -K $c tx-checksum-ipv4 on >/dev/null 2>&1 + ethtool -K $c tx-checksum-ipv6 on >/dev/null 2>&1) +- ethtool -K $c tx-scatter-gather on >/dev/null 2>&1 ++ #ethtool -K $c tx-scatter-gather on >/dev/null 2>&1 + ethtool -K $c gso on >/dev/null 2>&1 + ethtool -K $c tso on >/dev/null 2>&1 + ethtool -K $c ufo on >/dev/null 2>&1 +diff --git a/package/lean/autocore/files/x86/index.htm b/package/lean/autocore/files/x86/index.htm +index b0b56033..cbf45bc2 100644 +--- a/package/lean/autocore/files/x86/index.htm ++++ b/package/lean/autocore/files/x86/index.htm +@@ -718,6 +718,7 @@ + <%:Firmware Version%> + <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> ++ built by DYC + + <%:Kernel Version%><%=unameinfo.release or "?"%> + <%:Local Time%>- +diff --git a/package/lean/autocore/files/x86/sbin/cpuinfo b/package/lean/autocore/files/x86/sbin/cpuinfo +index 8c0527f8..575c620f 100755 +--- a/package/lean/autocore/files/x86/sbin/cpuinfo ++++ b/package/lean/autocore/files/x86/sbin/cpuinfo +@@ -1,5 +1,5 @@ + #!/bin/sh + +-MHz=`grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'` +-TEMP=`sensors 2>/dev/null | grep 'Core 0' | cut -c12-` ++MHz=`echo "$(cat /sys/devices/system/cpu/cpu[04]/cpufreq/cpuinfo_cur_freq)/1000" | bc` ++TEMP=`echo "scale=2; $(cat /sys/class/thermal/thermal_zone0/temp)/1000" | bc` + echo "$MHz MHz $TEMP "