Merge pull request #20 from FreifunkMD/migrate

update to v2014.3 for 0.29

.gitignore

@@ -1 +1,2 @@
 *~
+*.swp

build.sh

@@ -50,8 +50,14 @@ else
 fi
 
 case "xx$GLUON_BRANCH" in
-    'xxstable'|'xxbeta'|'xxexperimental')
-        # fine
+    'xxstable')
+        GLUON_PRIORITY=14
+        ;;
+    'xxbeta')
+        GLUON_PRIORITY=3
+        ;;
+    'xxexperimental')
+        # use default GLUON_PRIORITY set in site.mk
         ;;
     *)
         echo "Unknown GLUON_BRANCH '$1'."
@@ -60,20 +66,23 @@ case "xx$GLUON_BRANCH" in
         ;;
 esac
 
+export GLUON_BRANCH GLUON_PRIORITY
+
 # get GLUON_CHECKOUT from site dir
 pushd ${SCRIPTDIR}
 eval `make -s -f helper.mk`
 echo "GLUON_CHECKOUT: ${GLUON_CHECKOUT}"
 
 # build
 pushd ..
+make clean $VERBOSE
 git checkout master
 git pull
 git checkout ${GLUON_CHECKOUT}
 make clean $VERBOSE
 make update $VERBOSE
 make -j4 $VERBOSE
-GLUON_BRANCH=${GLUON_BRANCH} make manifest $VERBOSE
+make manifest $VERBOSE
 popd
 
 popd

site.conf

@@ -83,7 +83,6 @@
             stable = {
                 name = 'stable',
                 mirrors = {'http://stable.updates.firmware.ffmd'},
-                probability = 0.08,
                 good_signatures = 2,
                 pubkeys = {
                     '84064131d410a6363071e65c0f010ae0e8c5881db77eec5f7e712fc723178799', -- Alex
@@ -95,7 +94,6 @@
             beta = {
                 name = 'beta',
                 mirrors = {'http://beta.updates.firmware.ffmd'},
-                probability = 0.08,
                 good_signatures = 2,
                 pubkeys = {
                     '84064131d410a6363071e65c0f010ae0e8c5881db77eec5f7e712fc723178799', -- Alex
@@ -107,7 +105,6 @@
             experimental = {
                 name = 'experimental',
                 mirrors = {'http://experimental.updates.firmware.ffmd'},
-                probability = 1.00,
                 good_signatures = 1,
                 pubkeys = {
                     '84064131d410a6363071e65c0f010ae0e8c5881db77eec5f7e712fc723178799', -- Alex
@@ -122,7 +119,7 @@
     simple_tc = {
         mesh_vpn = {
             ifname = 'mesh-vpn',
-            enabled = 0,
+            enabled = false,
             limit_egress = 200,
             limit_ingress = 3000,
         },

site.mk

@@ -3,13 +3,14 @@ this_dir := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 
 GLUON_SITE_PACKAGES := \
 	gluon-alfred \
+	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-firewall \
 	gluon-luci-admin \
 	gluon-luci-autoupdater \
+	gluon-luci-portconfig \
 	gluon-next-node \
 	gluon-mesh-batman-adv \
 	gluon-mesh-vpn-fastd \
@@ -19,10 +20,12 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_CHECKOUT := v2014.2
+DEFAULT_GLUON_CHECKOUT := v2014.3
 # Allow overriding the checkout from the command line
 GLUON_CHECKOUT ?= $(DEFAULT_GLUON_CHECKOUT)
 
 DEFAULT_GLUON_RELEASE := $(shell git --git-dir=$(this_dir)/.git --work-tree=$(this_dir) describe --tags --always --dirty --match "v*" | sed 's/^v//')
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
+
+GLUON_PRIORITY ?= 0