From 5dc24e77d2c836b9245de501805eed99d9d44522 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 11 Oct 2017 23:48:22 +0800 Subject: [PATCH] update x86 profile and luci display --- include/target.mk | 2 +- package/lean/autocore/Makefile | 4 ++-- package/lean/autocore/files/autocore | 8 ++++++++ target/linux/x86/Makefile | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/target.mk b/include/target.mk index faf4dee13f..86c5e6bd5e 100644 --- a/include/target.mk +++ b/include/target.mk @@ -17,7 +17,7 @@ DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fs iptables-mod-nat-extra kmod-nf-nathelper kmod-nf-nathelper-extra kmod-macvlan block-mount \ default-settings ipset-lists luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ luci-app-filetransfer luci-app-shadowsocksr-pro luci-app-usb-printer luci-app-vsftpd luci-app-sfe \ -luci-app-pptp-server luci-app-openvpn-server +luci-app-pptp-server luci-app-ipsec-vpnd # For nas targets DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm # For router targets diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index d10232be9f..69310d8ec4 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=3 +PKG_RELEASE:=5 include $(INCLUDE_DIR)/package.mk @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk define Package/autocore TITLE:=x86/x64 auto core loadbalance script. MAINTAINER:=Lean - DEPENDS:=@TARGET_x86 +bc + DEPENDS:=@TARGET_x86 +bc +lm-sensors endef define Package/autocore/description diff --git a/package/lean/autocore/files/autocore b/package/lean/autocore/files/autocore index 216b362294..236d7ab50b 100755 --- a/package/lean/autocore/files/autocore +++ b/package/lean/autocore/files/autocore @@ -23,6 +23,14 @@ start() do echo $cc > $fileRps done + + a=$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq) + b=$(echo -n ' x ') + c=$(cat /proc/cpuinfo | grep 'processor' | wc -l) + d=$(echo -n ' @ ') + e=$(sensors | grep 'Core 0' | cut -c10-26) + f=${a}${b}${c}${d}${e} + echo $f > /tmp/sysinfo/model } diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 87bb5fbf6b..3320fb6adc 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -20,7 +20,7 @@ KERNELNAME:=bzImage include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs wpad kmod-usb-hid kmod-usb-net-asix kmod-usb-net-asix-ax88179 \ -kmod-ath5k kmod-ath9k kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-vmxnet3 htop lm-sensors +kmod-ath5k kmod-ath9k kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-vmxnet3 htop lm-sensors autocore $(eval $(call BuildTarget))