Developing lightweight computation at the DSG edge

Commit 49907bd1 authored by Roger Pueyo Centelles's avatar Roger Pueyo Centelles
Browse files

Merge branch 'master' into testing

parent faa944db
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
QMP_RELEASE?=trunk QMP_RELEASE?=testing
QMP_PKGRELEASE=r20170831-1 QMP_PKGRELEASE=r20170831-1
QMP_CODENAME?=Kalimotxo QMP_CODENAME?=testing
QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M) QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
PKG_NAME:=bmx6-mdns PKG_NAME:=bmx6-mdns
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
QMP_RELEASE?=trunk QMP_RELEASE?=testing
QMP_PKGRELEASE=r20170831-1 QMP_PKGRELEASE=r20170831-1
QMP_CODENAME?=Kalimotxo QMP_CODENAME?=testing
QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M) QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
PKG_NAME:=qmp-big-node PKG_NAME:=qmp-big-node
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
QMP_RELEASE?=trunk QMP_RELEASE?=testing
QMP_PKGRELEASE=r20170831-2 QMP_PKGRELEASE=r20170831-2
QMP_CODENAME?=Kalimotxo QMP_CODENAME?=testing
QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M) QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
PKG_NAME:=qmp-small-node PKG_NAME:=qmp-small-node
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
QMP_RELEASE?=trunk QMP_RELEASE?=testing
QMP_PKGRELEASE=r20170831-3 QMP_PKGRELEASE=r20170831-3
QMP_CODENAME?=Kalimotxo QMP_CODENAME?=testing
QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M) QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
PKG_NAME:=qmp-system PKG_NAME:=qmp-system
......
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
STAGE="$1" STAGE="$1"
[ "$STAGE" == "birth" ] && { [ "$STAGE" == "birth" ] && {
echo "Configuring eth0 as wan+mesh and eth1.1 as lan+mesh" echo "Configuring eth0 as wan and eth1 as lan"
uci set qmp.interfaces.lan_devices="eth1.1"
uci set qmp.interfaces.ignore_devices="eth1"
uci set qmp.interfaces.wan_devices="eth0" 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 uci commit qmp
} }
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
QMP_RELEASE?=trunk QMP_RELEASE?=testing
QMP_PKGRELEASE=r20170831-1 QMP_PKGRELEASE=r20170831-1
QMP_CODENAME?=Kalimotxo QMP_CODENAME?=testing
QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M) QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
PKG_NAME:=qmp-tiny-node PKG_NAME:=qmp-tiny-node
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment