fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Lean's source

Browse Source
This commit is contained in:
CN_SZTL 2020-03-27 17:01:40 +08:00
commit b1f9dd475d
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 7 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lean/luci-app-ssr-plus/Makefile
View File

@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=174
PKG_RELEASE:=10
PKG_VERSION:=175
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@ -232,7 +232,7 @@ start_rules() {
else
netflix="0"
fi
netflix_ip=$(check_host $(uci_get_by_name $NETFLIX_SERVER server))
netflix_ip=$(check_host $(uci_get_by_name $NETFLIX_SERVER server 127.0.0.1))
/usr/bin/ssr-rules \
-s "$server" \
-l "$local_port" \

1
package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules
View File

@ -75,7 +75,6 @@ flush_r() {
ipset -X whitelist 2>/dev/null
ipset -X blacklist 2>/dev/null
ipset -X netflix 2>/dev/null
ipset -X china 2>/dev/null
[ -n "$FWI" ] && echo '#!/bin/sh' >$FWI
return 0
}

4
target/linux/ipq806x/base-files/etc/board.d/01_leds
View File

@ -33,10 +33,6 @@ netgear,r7800)
ucidef_set_led_switch "wan" "WAN" "${boardname}:white:wan" "switch0" "0x20"
ucidef_set_led_ide "esata" "eSATA" "${boardname}:white:esata"
;;
ruijie,rg-mtfi-m520)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2g" "phy1tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5g" "phy0tpt"
;;
tplink,c2600)
ucidef_set_led_usbport "usb1" "USB 1" "${boardname}:white:usb_2" "usb1-port1" "usb2-port1"
ucidef_set_led_usbport "usb2" "USB 2" "${boardname}:white:usb_4" "usb3-port1" "usb4-port1"

8
target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh
View File

@ -5,10 +5,10 @@
preinit_set_mac_address() {
case $(board_name) in
ruijie,rg-mtfi-m520)
base_mac=$(mtd_get_mac_ascii PRODUCTINFO ethaddr)
ip link set dev eth0 address $(macaddr_add "$base_mac" +1)
ip link set dev eth1 address $(macaddr_add "$base_mac" +2)
;;
base_mac=$(mtd_get_mac_ascii PRODUCTINFO ethaddr)
ip link set dev eth0 address $(macaddr_add "$base_mac" +1)
ip link set dev eth1 address $(macaddr_add "$base_mac" +2)
;;
esac
}

21
target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-mtfi-m520.dts
View File

@ -388,27 +388,6 @@
linux,code = <KEY_RESTART>;
};
};
leds {
compatible = "gpio-leds";
pinctrl-0 = <&led_pins>;
pinctrl-names = "default";
usb_1 {
label = "m520:green:usb_1";
gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
};
usb_3 {
label = "m520:green:usb_3";
gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
};
status_green {
label = "m520:green:status";
gpios = <&qcom_pinmux 9 GPIO_ACTIVE_LOW>;
};
};
};
&adm_dma {

21
target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-mtfi-m520.dts
View File

@ -388,27 +388,6 @@
linux,code = <KEY_RESTART>;
};
};
leds {
compatible = "gpio-leds";
pinctrl-0 = <&led_pins>;
pinctrl-names = "default";
usb_1 {
label = "m520:green:usb_1";
gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
};
usb_3 {
label = "m520:green:usb_3";
gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
};
status_green {
label = "m520:green:status";
gpios = <&qcom_pinmux 9 GPIO_ACTIVE_LOW>;
};
};
};
&adm_dma {