Merge pull request #326 from Ysurac/develop

sync

golang/golang/Makefile

@@ -37,7 +37,8 @@ PKG_CPE_ID:=cpe:/a:golang:go
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_DIR:=$(BUILD_DIR)/go-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
+#PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 PKG_GO_PREFIX:=/usr
 PKG_GO_VERSION_ID:=$(GO_VERSION_MAJOR_MINOR)

openmptcprouter/files/etc/firewall.gre-tunnel

@@ -6,7 +6,7 @@ if [ -f /usr/sbin/iptables-legacy ]; then
 	IPTABLESRESTORE="/usr/sbin/iptables-legacy-restore"
 else
 	IPTABLESSAVE="/usr/sbin/iptables-save"
-	IPTABLESRESTORE="/usr/sbin/iptables-restore"
+	IPTABLESRESTORE="/usr/sbin/iptables-restore --noflush"
 fi
 
 _setup_rules() {
@@ -39,7 +39,7 @@ _setup_fw() {
 	[ -n "$ifnames" ] && rule="$rule -i $(echo "${ifnames}" | sed 's/ /-i /g')"
 	if [ -n "$rule" ] && [ -n "$lookup" ]; then
 		$IPTABLESAVE --counters | grep -v "0x${lookup}" | $IPTABLERESTORE -w --counters
-		$IPTABLERESTORE --noflush <<-EOF
+		$IPTABLERESTORE <<-EOF
 			*mangle
 			-A omr-gre-tunnel ${rule} -j MARK --set-mark 0x${lookup}
 			COMMIT
@@ -48,7 +48,7 @@ _setup_fw() {
 }
 
 if [ -z "$($IPTABLESAVE | grep omr-gre-tunnel)" ]; then
-	$IPTABLERESTORE --noflush <<-EOF
+	$IPTABLERESTORE <<-EOF
 		*mangle
 		:omr-gre-tunnel -
 		-I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-gre-tunnel

v2ray-core/Makefile

@@ -18,7 +18,8 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
+♯PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 GO_PKG:=github.com/v2fly/v2ray-core/v5
 GO_PKG_BUILD_PKG:=$(GO_PKG)/main