Merge branch 'master' into testing

packages/bmx6-mdns/Makefile

@@ -25,9 +25,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=trunk
+QMP_RELEASE?=testing
 QMP_PKGRELEASE=r20170831-1
-QMP_CODENAME?=Kalimotxo
+QMP_CODENAME?=testing
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=bmx6-mdns

packages/qmp-big-node/Makefile

@@ -25,9 +25,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=trunk
+QMP_RELEASE?=testing
 QMP_PKGRELEASE=r20170831-1
-QMP_CODENAME?=Kalimotxo
+QMP_CODENAME?=testing
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=qmp-big-node

packages/qmp-small-node/Makefile

@@ -25,9 +25,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=trunk
+QMP_RELEASE?=testing
 QMP_PKGRELEASE=r20170831-2
-QMP_CODENAME?=Kalimotxo
+QMP_CODENAME?=testing
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=qmp-small-node

packages/qmp-system/Makefile

@@ -25,9 +25,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=trunk
+QMP_RELEASE?=testing
 QMP_PKGRELEASE=r20170831-3
-QMP_CODENAME?=Kalimotxo
+QMP_CODENAME?=testing
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=qmp-system

packages/qmp-system/files/etc/qmp/hooks/scripts/eth0-wan_eth1-lan.sh

@@ -3,10 +3,8 @@
 STAGE="$1"
 
 [ "$STAGE" == "birth" ] && {
-	echo "Configuring eth0 as wan+mesh and eth1.1 as lan+mesh"
-	uci set qmp.interfaces.lan_devices="eth1.1"
-	uci set qmp.interfaces.ignore_devices="eth1"
+	echo "Configuring eth0 as wan and eth1 as lan"
 	uci set qmp.interfaces.wan_devices="eth0"
-	uci set qmp.interfaces.mesh_devices="eth0 eth1.1"
+	uci set qmp.interfaces.lan_devices="eth1"
 	uci commit qmp
 }

packages/qmp-tiny-node/Makefile

@@ -25,9 +25,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=trunk
+QMP_RELEASE?=testing
 QMP_PKGRELEASE=r20170831-1
-QMP_CODENAME?=Kalimotxo
+QMP_CODENAME?=testing
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=qmp-tiny-node