Merge branch 'issue#383-bugfix' into testing

Conflicts:
	packages/qmp-system/files/etc/uci-defaults/qmp_enable_opkg_feeds

packages/bmx6-mdns/Makefile

@@ -31,7 +31,7 @@ PKG_LICENSE:=GPL-2.0+
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 QMP_CODENAME:=Clearance
-QMP_RELEASE:=testing
+QMP_RELEASE:=3.2
 QMP_BUILDDATE:=$(shell date +%Y%m%d_%H%M)
 
 include $(INCLUDE_DIR)/package.mk

packages/qmp-big-node/Makefile

@@ -25,7 +25,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=testing
+QMP_RELEASE?=3.2
 QMP_CODENAME?=Clearance
 
 PKG_NAME:=qmp-big-node

packages/qmp-small-node/Makefile

@@ -25,7 +25,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=testing
+QMP_RELEASE?=3.2
 QMP_CODENAME?=Clearance
 
 PKG_NAME:=qmp-small-node

packages/qmp-system/Makefile

@@ -25,7 +25,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=testing
+QMP_RELEASE?=3.2
 QMP_CODENAME?=Clearance
 QMP_BUILDDATE:=$(shell date +%Y%m%d_%H%M)
 

packages/qmp-system/files/etc/qmp/qmp.default-config

@@ -63,7 +63,7 @@ config 'qmp' 'services'
 # -----------------------------
 config 'qmp' 'update'
 	# Remote URL where the firmware images are placed.
-	option url 'http://fw.qmp.cat/testing'
+	option url 'http://fw.qmp.cat/stable'
 	
 	# Special remote file which contains a list of firmware:md5hash.
 	option images 'IMAGES'

packages/qmp-system/files/etc/qmp/qmp_update.sh

@@ -42,7 +42,7 @@ qmp_update_get_checksum_from_image() {
 
 qmp_update_extract_timestamp() {
 	image_name="$1"
-	echo "$image_name" | awk -F\- '{print $NF}' | awk -F_ '{print $1}' | sed s/"\..*"//
+	echo $image_name | awk -F_ '{print $NF}' | awk -F\- '{print $1}'
 }
 
 qmp_update_get_config() {

packages/qmp-tiny-node/Makefile

@@ -25,7 +25,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=testing
+QMP_RELEASE?=3.2
 QMP_CODENAME?=Clearance
 
 PKG_NAME:=qmp-tiny-node