Merges changes for v0.6.0~rc2 into stable branch to release v0.6.0.

Signed-off-by: Stefan Laudemann <thisco@webcake.de>

modules

@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffpb'
 
 PACKAGES_FFPB_REPO=http://git.c3pb.de/freifunk-pb/ffpb-packages.git
-PACKAGES_FFPB_COMMIT=b7a2c2f8739ffcd34bfd10ea29d2929fa1fc99c2
+PACKAGES_FFPB_COMMIT=f2d788633930dfdc170802aad8b899f9d3ca7208

site.conf

@@ -19,8 +19,8 @@
 	-- network-internal ntp service
 	ntp_servers = {'ntp.services.ffpb'},
 
-	-- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/attitude_adjustment/12.09/%S/packages/',
+        -- OpenWRT Package Repository (IPv6 capable)
+	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
 
 	-- regulatory domain of your wifi
 	regdom = 'DE',
@@ -32,7 +32,7 @@
 	wifi24 = {
 		ssid = 'paderborn.freifunk.net',
 		channel = 1,
-		htmode = 'HT40+',
+		htmode = 'HT20',
 		mesh_ssid = '02:d1:11:13:87:ad',
 		mesh_bssid = '02:d1:11:13:87:ad',
 		mesh_mcast_rate = 12000,

site.mk

@@ -1,26 +1,33 @@
 GLUON_SITE_PACKAGES := \
+	gluon-mesh-batman-adv-14 \
 	ffpb-alfred-watchdog \
 	ffpb-banner \
 	ffpb-debug \
+        ffpb-node-tuning \
+	ffpb-openwrt-migration-tools \
 	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \
-	gluon-config-mode \
+	gluon-config-mode-autoupdater \
+	gluon-config-mode-hostname \
+	gluon-config-mode-mesh-vpn \
+	gluon-config-mode-geo-location \
+	gluon-config-mode-contact-info \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \
 	gluon-luci-autoupdater \
 	gluon-luci-portconfig \
-	gluon-mesh-batman-adv \
-	gluon-mesh-vpn-fastd \
 	gluon-next-node \
+	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.5.3+exp$(shell date '+%Y%m%d')
+# 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
+DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)