Merge 3c52a7f29f into cc8a62c029

2016-03-24 20:30:57 +00:00 · 2016-03-24 20:30:57 +00:00 · f8dbb90ec9
commit f8dbb90ec9
parent cc8a62c029 3c52a7f29f
3 changed files with 8 additions and 2 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 GLUON_SITE_FEEDS='tro ffrl'

 PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git
-PACKAGES_TRO_COMMIT=0f040492f25c81355407e2518d21449b9a7348be
+PACKAGES_TRO_COMMIT=cd9151e1d9f7e2e8b150e2a52a3ad99d8bdf5ed0
 PACKAGES_TRO_BRANCH=v2016.1

 PACKAGES_FFRL_REPO=https://github.com/ffrl/ffrl-packages
--- a/site.conf
+++ b/site.conf
@ -141,4 +141,9 @@
            service,
        },
    },
+    debugserver = {
+	host = { '2a03:2260:121:0:5c51:68ff:fed6:6a69' },
+	port = 1337,
+	liveport = 2003,
+    },
    }
--- a/site.mk
+++ b/site.mk
@ -28,7 +28,8 @@ GLUON_SITE_PACKAGES := \
    haveged \
    tro-netwatch \
    gluon-ssid-changer \
-    gluon-banner
+    gluon-banner \
+    fftdf-debug

 DEFAULT_GLUON_RELEASE := 2014.4-stable-2.1
 # Allow overriding the release number from the command line