[Makefiles] Update version, description and dependencies for several packages

packages/bmx6-mdns/Makefile

@@ -21,26 +21,29 @@
 #	Pau Escrich <p4u@dabax.net>
 #
 
+
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
+QMP_RELEASE?=trunk
+QMP_PKGRELEASE=r20170831-1
+QMP_CODENAME?=Kalimotxo
+QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
+
 PKG_NAME:=bmx6-mdns
-PKG_VERSION:=0.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.1.1
+PKG_RELEASE:=$(QMP_CODENAME)
 PKG_LICENSE:=GPL-2.0+
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-QMP_RELEASE?=r20161116-1
-QMP_CODENAME?=testing
-QMP_BUILDDATE:=$(shell date +%Y%m%d_%H%M)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bmx6-mdns
-  TITLE:=bmx6 distributed DNS
+  TITLE:=Distributed DNS server based on BMX6 using bmx6-sms plugin
   SECTION:=net
   CATEGORY:=qMp
-  URL:=http://qmp.cat
+  URL:=https://qmp.cat
   DEPENDS:=+bmx6-sms
 endef
 

packages/qmp-big-node/Makefile

@@ -25,9 +25,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=testing
-QMP_PKGRELEASE=r20161013-1
-QMP_CODENAME?=testing
+QMP_RELEASE?=trunk
+QMP_PKGRELEASE=r20170831-1
+QMP_CODENAME?=Kalimotxo
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=qmp-big-node
@@ -35,15 +35,15 @@ PKG_VERSION:=$(QMP_RELEASE)-$(QMP_PKGRELEASE)
 PKG_RELEASE:=$(QMP_CODENAME)
 PKG_LICENSE:=GPL-2.0+
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/qmp-big-node
+  TITLE:=Quick Mesh Project (qMp) full-featured node (8+ MB flash devices)
   SECTION:=net
   CATEGORY:=qMp
-  TITLE:=Full-featured qMp node with addons (8 MB flash)
-  URL:=http://qmp.cat
+  URL:=https://qmp.cat
   DEPENDS:= +qmp-small-node \
 	+qmp-tinyproxy +tinymce \
 	+openssl-util +luci-ssl \
@@ -51,21 +51,22 @@ define Package/qmp-big-node
 endef
 
 define Package/qmp-big-node/description
- This metapackage installs the extra addon packages for big qMp nodes:
+ This metapackage provides a full-blown qMp node with all the features and extra
+ addons:
+  - qMp system configuration files and scripts
   - BMX6 routing protocol
-  - Luci web interface (HTTP/HTTPS)
-  - qMp system configuration files
+  - Full LuCI web interface (via HTTPS with SSL)
   - IP/TCP utils
-  - b6m and libremap
+  - LibreMap and b6m tools
   - SNMP and Munin
-  - IP over IP support
-  - Tinyproxy
+  - IP over IP tunneling support
+  - Tinyproxy with captive portal
 
- It is intended to be used on devices with 8 MB of flash or more.
+ It is intended to be used on devices with more than 8 MB of flash.
 endef
 
 define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
 endef
 
 define Build/Configure
@@ -75,7 +76,7 @@ define Build/Compile
 endef
 
 define Package/qmp-big-node/install
-    $(INSTALL_DIR) $(1)/etc/qmp
+	$(INSTALL_DIR) $(1)/etc/qmp
 endef
 
 $(eval $(call BuildPackage,qmp-big-node))

packages/qmp-small-node/Makefile

@@ -25,28 +25,28 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=testing
-QMP_PKGRELEASE=r20170207-3
-QMP_CODENAME?=testing
+QMP_RELEASE?=trunk
+QMP_PKGRELEASE=r20170831-1
+QMP_CODENAME?=Kalimotxo
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=qmp-small-node
 PKG_VERSION:=$(QMP_RELEASE)-$(QMP_PKGRELEASE)
 PKG_RELEASE:=$(QMP_CODENAME)
-PGK_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0+
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/qmp-small-node
+  TITLE:=Quick Mesh Project (qMp) standard node (8 MB flash devices)
   SECTION:=net
   CATEGORY:=qMp
-  TITLE:=Standard qMp node (8 MB flash devices)
-  URL:=http://qmp.cat
+  URL:=https://qmp.cat
   DEPENDS:= +qmp-tiny-node \
 	+iputils-arping +iputils-clockdiff +tcpdump-mini +b6m +b6m-spread \
-	+iputils-ping6 +mtr +netperf \
+	+iputils-ping6 +mtr +netperf +luci-mod-admin-full +bmx6-sms \
 	+munin-mesh +mini_snmpd +cgi-bin-zero +ipip +kmod-ipip +kmod-gre \
 	+libremap-agent +luci-lib-libremap-contact +luci-lib-libremap-wireless \
 	+luci +luci-lib-libremap-system +luci-lib-libremap-location \
@@ -54,14 +54,14 @@ define Package/qmp-small-node
 endef
 
 define Package/qmp-small-node/description
- This metapackage installs the packages required for setting up a typical qMp node:
+ This metapackage provides a standard qMp node with the following features:
+  - qMp system configuration files and scripts
   - BMX6 routing protocol
-  - Luci web interface
-  - qMp system configuration files
+  - Full LuCI web interface
   - IP/TCP utils
-  - b6m and libremap
+  - LibreMap and b6m tools
   - SNMP and Munin
-  - IP over IP support
+  - IP over IP tunneling support
 
  It is intended to be used on devices with 8 MB of flash or more.
 endef
@@ -74,11 +74,11 @@ define Build/Compile
 endef
 
 define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
 endef
 
 define Package/qmp-small-node/install
-    $(INSTALL_DIR) $(1)/etc/qmp
+	$(INSTALL_DIR) $(1)/etc/qmp
 endef
 
 $(eval $(call BuildPackage,qmp-small-node))

packages/qmp-system/Makefile

@@ -25,9 +25,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=testing
-QMP_PKGRELEASE=r20170207-3
-QMP_CODENAME?=testing
+QMP_RELEASE?=trunk
+QMP_PKGRELEASE=r20170831-1
+QMP_CODENAME?=Kalimotxo
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=qmp-system
@@ -40,16 +40,23 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/qmp-system
-  TITLE:=Quick Mesh Project system files
+  TITLE:=Quick Mesh Project (qMp) system files
   SECTION:=net
   CATEGORY:=qMp
-  URL:=http://qmp.cat
+  URL:=https://qmp.cat
   DEPENDS:=+libuci-lua +lua +libiwinfo-lua +wpad-mini +kmod-ipt-nat +luci-base\
-   +bmx6 +bmx6-uci-config +bmx6-json +bmx6-sms +gwck-qmp +ip +iw +iwinfo
+   +bmx6 +bmx6-uci-config +bmx6-json +gwck-qmp +ip +iw +iwinfo
 endef
 
 define Package/qmp-system/description
- System files required for configuring a qMp node
+ This package contains the basic system files and scripts required for
+ configuring and running a qMp node.
+
+ To have a fully working qMp node, it is strongly recommended to install one of
+ the following packages:
+  - qmp-tiny-node: minimalistic node (4 MB flash devices)
+  - qmp-small-node: standard node (8 MB flash devices)
+  - qmp-big-node: full-featured node (8+ MB flash devices)
 endef
 
 define Build/Prepare

packages/qmp-tiny-node/Makefile

@@ -25,9 +25,9 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-QMP_RELEASE?=testing
-QMP_PKGRELEASE=r20170207-3
-QMP_CODENAME?=testing
+QMP_RELEASE?=trunk
+QMP_PKGRELEASE=r20170831-1
+QMP_CODENAME?=Kalimotxo
 QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
 
 PKG_NAME:=qmp-tiny-node
@@ -40,26 +40,27 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/qmp-tiny-node
+  TITLE:=Quick Mesh Project (qMp) minimalistic node (4 MB flash devices)
   SECTION:=net
   CATEGORY:=qMp
-  TITLE:=Minimalistic qMp node (4 MB flash devices)
-  URL:=http://qmp.cat
+  URL:=https://qmp.cat
   DEPENDS:= +qmp-system \
-	+luci-app-bmx6 +luci-mod-admin-full +luci-theme-bootstrap +uhttpd \
+	+luci-app-bmx6 +luci-theme-bootstrap +uhttpd \
 	+uhttpd-mod-ubus
 endef
 
 define Package/qmp-tiny-node/description
- This metapackage installs the packages required for setting up a minimal qMp node:
+ This metapackage provides a minimalistic qMp node with just the bare minimum
+ features:
+  - qMp system configuration files and scripts
   - BMX6 routing protocol
-  - Luci web interface
-  - qMp system configuration files
+  - Minimalistic LuCI web interface (only for qMp settings)
 
- It is intended to be used on devices with 4 MB of flash.
+ It is intended to be used on storage-constrained devices with 4 MB flash.
 endef
 
 define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
 endef
 
 define Build/Configure