Merge commits from branch 'testing' of qmp.cat:qmp:

 · 8cbc3e4b
 · b9b1807a
 · d062c771
 · b53cd749
 · 82a81f77
 · 8395483e
 · 7ec49317
 · 56930de1

feeds.conf

@@ -2,8 +2,9 @@
 
 src-link packages PATH/packages
 src-link qmp_packages PATH/qmp/packages
+src-git luci https://github.com/openwrt/luci.git
+src-git openwrt_routing https://github.com/openwrt-routing/packages.git
+src-git oldpackages http://git.openwrt.org/packages.git
+src-git libremap_agent https://github.com/libremap/libremap-agent-openwrt.git
 src-git b6m_packages git://qmp.cat/b6m.git;openwrt
-src-git luci git://git.openwrt.org/project/luci.git
-src-git openwrt_routing git://github.com/openwrt-routing/packages.git
-src-git libremap_agent git://github.com/libremap/libremap-agent-openwrt.git
 src-git nc git://qmp.cat/ncr.git

packages/qmp-big-node/Makefile

@@ -26,7 +26,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qmp-big-node
-PKG_RELEASE:=2
+PKG_VERSION:=4.0
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0+
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,20 +37,27 @@ include $(INCLUDE_DIR)/package.mk
 define Package/qmp-big-node
   SECTION:=net
   CATEGORY:=qMp
-  TITLE:=Addons for big qMp mesh node (8MByte flash or more)
+  TITLE:=Full-featured qMp node with addons (8 MB flash)
   URL:=http://qmp.cat
-  DEPENDS:= \
-	+qmp-small-node \
+  DEPENDS:= +qmp-small-node \
 	+qmp-tinyproxy +tinymce \
 	+openssl-util +luci-ssl \
-	+lsof \
-	+wget +bmon +bwm +ebtables +pv \
-	+ndisc6 +rdisc6 \
-	+ipv6calc
+	+lsof +wget +bmon +bwm +ebtables +pv \
+	+ndisc6 +rdisc6 +ipv6calc
 endef
 
 define Package/qmp-big-node/description
- Addons for big qmp nodes (8MByte flash or more)
+ This metapackage installs the extra addon packages for big qMp nodes:
+  - BMX6 routing protocol
+  - Luci web interface (HTTP/HTTPS)
+  - qMp system configuration files
+  - IP/TCP utils
+  - b6m and libremap
+  - SNMP and Munin
+  - IP over IP support
+  - Tinyproxy
+
+ It is intended to be used on devices with 8 MB of flash or more.
 endef
 
 define Build/Prepare

packages/qmp-quagga/Makefile

@@ -45,7 +45,6 @@ define Package/qmp-quagga/Default
   SECTION:=qMp
   CATEGORY:=qMp
   SUBMENU:=Routing and Redirection
-  DEPENDS:=qmp-quagga
   TITLE:=The Quagga Software Routing Suite
   URL:=http://www.quagga.net
   MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>

packages/qmp-small-node/Makefile

@@ -26,7 +26,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qmp-small-node
+PKG_VERSION:=4.0
 PKG_RELEASE:=1
+PGK_LICENSE:=GPL-2.0+
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,22 +37,30 @@ include $(INCLUDE_DIR)/package.mk
 define Package/qmp-small-node
   SECTION:=net
   CATEGORY:=qMp
-  TITLE:=Required addons for small qMp mesh node
+  TITLE:=Standard qMp node (8 MB flash devices)
   URL:=http://qmp.cat
-  DEPENDS:= \
-	+qmp-tiny-node \
-	+iputils-arping +iputils-clockdiff +tcpdump-mini \
-	+cgi-bin-zero +mtr +netperf \
-	+kmod-ipip +kmod-gre \
-	+b6m +b6m-spread \
-	+munin-mesh +mini-snmpd
+  DEPENDS:= +qmp-tiny-node \
+	+iputils-arping +iputils-clockdiff +tcpdump-mini +b6m +b6m-spread \
+	+iputils-ping6 +netperf +mtr \
+	+munin-mesh +mini-snmpd +cgi-bin-zero +kmod-ipip +kmod-gre \
+	+libremap-agent +luci-lib-libremap-contact +luci-lib-libremap-wireless \
+	+luci +luci-lib-libremap-system +luci-lib-libremap-location
 endef
 
-
 define Package/qmp-small-node/description
- Addons for small qmp nodes (4MByte flash)
+ This metapackage installs the packages required for setting up a typical qMp node:
+  - BMX6 routing protocol
+  - Luci web interface
+  - qMp system configuration files
+  - IP/TCP utils
+  - b6m and libremap
+  - SNMP and Munin
+  - IP over IP support
+
+ It is intended to be used on devices with 8 MB of flash or more.
 endef
 
+
 define Build/Configure
 endef
 

packages/qmp-system/Makefile

@@ -26,10 +26,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qmp-system
-PKG_RELEASE:=2
+PKG_VERSION:=4.0
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0+
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
 QMP_CODENAME:=Kalimotxo
-QMP_RELEASE:=unstable
+QMP_RELEASE:=trunk
 QMP_BUILDDATE:=$(shell date +%Y%m%d_%H%M)
 
 include $(INCLUDE_DIR)/package.mk
@@ -39,11 +43,11 @@ define Package/qmp-system
   SECTION:=net
   CATEGORY:=qMp
   URL:=http://qmp.cat
-  DEPENDS:=+luci-lib-core +luci-lib-nixio +luci-lib-sys +luci-lib-web +libiwinfo-lua
+  DEPENDS:=+libuci-lua +lua +libiwinfo-lua +wpad-mini
 endef
 
 define Package/qmp-system/description
- System files for qMp node
+ System files required for configuring a qMp node
 endef
 
 define Build/Prepare

packages/qmp-system/files/usr/lib/lua/luci/view/qmp/overview.htm

 <%+header%>
 
-
 <div align="center">
 	<a href="http://qmp.cat" target="_blank"><img src="/luci-static/resources/qmp/logo.png" /></a>
 </div>
 
 <h2>About qMp</h2>
-<ul>
-<li>QMP is firmware for embedded network devices based on OpenWRT GNU/linux operating system</li>
-<li>It provides an easy way to set up networks using MESH it doesn't matter your they are either wired or WiFi or a mix of both</li>
-<li>It is a fast and reliable way to extend an Internet uplink to end-users</li>
-</ul>
+<p>Quick Mesh Project (qMp) is a system for easily deploying Mesh/MANET networks using Wi-Fi technology.</p>
+<p>qMp has been designed for being used in any scenario such as free community networks, corporative networks, large social events, quick network deployments, etc. You can read <a href="http://qmp.cat/Documentation">here</a> about how it works.</p>
+<p>The qMp firmware, based on OpenWrt GNU/Linux, works on many embedded WiFi network devices. You can get the compiled binaries for your device <a href="http://qmp.cat/Download">here</a>. All the qMp source code is public, free and open, and can be accessed from the <a href="http://dev.qmp.cat">development website</a>. If you want to join the project and contribute with your code, you can <a href="http://qmp.cat/Development">learn more</a> on how to start contributing on qMp.</p>
+
 <br />
 <p>Visit our web page for more information: <a href="http://qmp.cat" target="_blank">http://qmp.cat</a> </p>
 
@@ -24,7 +22,7 @@
 </p>
 
 <p>
-<strong>Version:</strong> <%=string.sub(version,2,-3)%> 
+<strong>Version:</strong> <%=string.sub(version,2,-3)%>
 </p>
 
 <p>

packages/qmp-tiny-node/Makefile

@@ -26,7 +26,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qmp-tiny-node
-PKG_RELEASE:=2
+PKG_VERSION:=4.0
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0+
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,23 +37,22 @@ include $(INCLUDE_DIR)/package.mk
 define Package/qmp-tiny-node
   SECTION:=net
   CATEGORY:=qMp
-  TITLE:=Basic addons for default qMp node
+  TITLE:=Minimalistic qMp node (4 MB flash devices)
   URL:=http://qmp.cat
-  DEPENDS:= \
-  +qmp-system \
-  +uhttpd +iwinfo \
-  +luci-app-bmx6 +luci-mod-admin-full +luci-i18n-english \
-  +radvd +wpad-mini +iw \
-  +bmx6 +bmx6-uci-config +bmx6-json +bmx6-sms +bmx6-mdns \
-  +gwck-qmp +luci-theme-qmp \
-  +libremap-agent +luci-lib-libremap-contact +luci-lib-libremap-wireless \
-  +luci-lib-libremap-system +luci-lib-libremap-location \
-  +ip +iputils-ping6 +kmod-ipt-nat
+  DEPENDS:= +qmp-system \
+	+bmx6 +bmx6-uci-config +bmx6-json +bmx6-sms +bmx6-mdns +luci-app-bmx6 +gwck-qmp \
+	+ip +iw +iwinfo \
+	+luci-mod-admin-full +luci-theme-bootstrap +luci-i18n-english \
+	+uhttpd +uhttpd-mod-ubus
 endef
 
-
 define Package/qmp-tiny-node/description
- Required addons for qMp node (only needed and basic stuff)
+ This metapackage installs the packages required for setting up a minimal qMp node:
+  - BMX6 routing protocol
+  - Luci web interface
+  - qMp system configuration files
+
+ It is intended to be used on devices with 4 MB of flash.
 endef
 
 define Build/Prepare

packages/qmp-tinyproxy/Makefile

@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/qmp-tinyproxy
   SECTION:=net
   CATEGORY:=qMp
-  TITLE:=Tinyproxy is a lightweight HTTP and HTTPS proxy with support splash
+  TITLE:=A lightweight HTTP(S) proxy with splash screen support
   URL:=http://tinyproxy.sourceforge.net/
   DEPENDS:=+tinymce
 endef