From 177c62711a8aaef0ea716f7d80dbe1d1f0bc4c02 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sun, 8 Dec 2019 06:41:32 -0800 Subject: [PATCH 1/3] luci-app-ssr-plus: fix cron --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 27ac7e1a9a..34c56d902e 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=1 -PKG_RELEASE:=130 +PKG_RELEASE:=131 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index a9ae82f335..372e077f3f 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -43,11 +43,10 @@ uci_get_by_type() { add_cron() { - sed -i '/ssrplus.log/d' $CRON_FILE - echo '0 1 * * * echo "" > /tmp/ssrplus.log' >> $CRON_FILE - [ -n "$(grep -w "/usr/share/shadowsocksr/subscribe.sh" $CRON_FILE)" ] && sed -i '/\/usr\/share\/shadowsocksr\/subscribe.sh/d' $CRON_FILE + sed -i '/shadowsocksr/d' $CRON_FILE + sed -i '/ssrplus.log/d' $CRON_FILE && echo '0 1 * * * echo "" > /tmp/ssrplus.log' >> $CRON_FILE [ $(uci_get_by_type server_subscribe auto_update 0) -eq 1 ] && echo "0 $(uci_get_by_type server_subscribe auto_update_time) * * * /usr/share/shadowsocksr/subscribe.sh" >> $CRON_FILE - [ -z "$(grep -w "/usr/share/shadowsocksr/update.sh" $CRON_FILE)" ] && echo "0 5 * * * /usr/share/shadowsocksr/update.sh" >> $CRON_FILE + [ $(uci_get_by_type server_subscribe auto_update 0) -eq 1 ] && echo "0 5 * * * /usr/share/shadowsocksr/update.sh" >> $CRON_FILE crontab $CRON_FILE } From e6cd7a8dbe5c16cf88dcc348e2552d63c0693b16 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sun, 8 Dec 2019 06:47:45 -0800 Subject: [PATCH 2/3] luci-app-unblockmusic: keep ca.crt and server key after upgrade --- package/lean/luci-app-unblockmusic/Makefile | 2 +- .../root/lib/upgrade/keep.d/unblockmusic | 3 +++ .../root/usr/share/UnblockNeteaseMusic/logcheck.sh | 4 ++-- .../root/usr/share/UnblockNeteaseMusic/update_core.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 package/lean/luci-app-unblockmusic/root/lib/upgrade/keep.d/unblockmusic diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index edc8e0255b..f8cdfe9c74 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.2.0 -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_LICENSE:=Apache-2.0 diff --git a/package/lean/luci-app-unblockmusic/root/lib/upgrade/keep.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/lib/upgrade/keep.d/unblockmusic new file mode 100644 index 0000000000..4f44321e28 --- /dev/null +++ b/package/lean/luci-app-unblockmusic/root/lib/upgrade/keep.d/unblockmusic @@ -0,0 +1,3 @@ +/usr/share/UnblockNeteaseMusic/ca.crt +/usr/share/UnblockNeteaseMusic/server.crt +/usr/share/UnblockNeteaseMusic/server.key \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh index 168020537d..4d8eb1001e 100755 --- a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh +++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh @@ -1,11 +1,11 @@ #!/bin/bash -log_max_size="10" #使用KB计算 +log_max_size="100" #使用KB计算 log_file="/tmp/unblockmusic.log" while true do - sleep 10s + sleep 30s icount=`busybox ps -w | grep app.js |grep -v grep| wc -l` if [ $icount -ne 2 ] ;then /etc/init.d/unblockmusic restart diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh index 51705698b8..649c5ac603 100755 --- a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh +++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh @@ -10,7 +10,7 @@ function clean_log(){ } function check_latest_version(){ - latest_ver="$(wget -O- https://github.com/nondanee/UnblockNeteaseMusic/commits/master |tr -d '\n' |grep -Eo 'commit\/[0-9a-z]+' |sed -n 1p |sed 's#commit/##g')" + latest_ver="$(wget-ssl --no-check-certificate -O- https://github.com/nondanee/UnblockNeteaseMusic/commits/master |tr -d '\n' |grep -Eo 'commit\/[0-9a-z]+' |sed -n 1p |sed 's#commit/##g')" [ -z "${latest_ver}" ] && echo -e "\nFailed to check latest version, please try again later." >>/tmp/unblockmusic_update.log && exit 1 if [ ! -e "/usr/share/UnblockNeteaseMusic/local_ver" ]; then clean_log From 40f51aebdec00d634f8b7ad46c4c28861a34cf75 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sun, 8 Dec 2019 07:31:11 -0800 Subject: [PATCH 3/3] ramips: add support for XiaoYu XY-C5 --- .../ramips/base-files/etc/board.d/02_network | 1 + .../linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts | 104 ++++++++++++++++++ target/linux/ramips/image/mt7621.mk | 9 ++ 3 files changed, 114 insertions(+) create mode 100644 target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 0ffd5d6560..993b3a6783 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -81,6 +81,7 @@ ramips_setup_interfaces() ai-br100|\ alfa-network,ac1200rm|\ mediatek,ap-mt7621a-v60|\ + xiaoyu,xy-c5|\ xzwifi,creativebox-v1|\ d240|\ db-wrt01|\ diff --git a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts new file mode 100644 index 0000000000..072b2cc455 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts @@ -0,0 +1,104 @@ +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { + compatible = "xiaoyu,xy-c5", "mediatek,mt7621-soc"; + model = "XiaoYu XY-C5"; + + aliases { + led-boot = &led_sys; + led-failsafe = &led_sys; + led-running = &led_sys; + led-upgrade = &led_sys; + label-mac-device = ðernet; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + leds { + compatible = "gpio-leds"; + + work { + label = "xy-c5:green:work"; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + }; + + led_sys: sys { + label = "xy-c5:green:sys"; + gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x50000 0x1fb0000>; + }; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "uart3", "wdt"; + ralink,function = "gpio"; + }; + }; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 51f92ceded..3173e528ef 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -130,6 +130,15 @@ define Device/mediatek_ap-mt7621a-v60 endef TARGET_DEVICES += mediatek_ap-mt7621a-v60 +define Device/xiaoyu_xy-c5 + MTK_SOC := mt7621 + IMAGE_SIZE := 32448k + DEVICE_VENDOR := XiaoYu + DEVICE_MODEL := XY-C5 + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 +endef +TARGET_DEVICES += xiaoyu_xy-c5 + define Device/xzwifi_creativebox-v1 DTS := CreativeBox-v1 IMAGE_SIZE := $(ralink_default_fw_size_32M)