Jenkins shall sign the build

added key of new buildserver (build.ffmuc.net), removed old one
2016-06-26 16:08:31 +02:00 · 2016-06-26 15:43:56 +02:00
9 changed files with 17 additions and 21 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,6 @@
     - https://gluon.readthedocs.org/en/v2016.1.5/releases/v2016.1.5.html
     - mesh_no_rebroadcast for mesh-on-wan (8b66da95f1887fc6068a6e9d6b6494c2ff4d2fb4)
     - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7)
-     - new package tecff-ath9k-broken-wifi-workaround (freifunkmuc/gluon-packages)
-     - added fix for autoupdater (8f5a7c90019085dd8f02f96ab0e7a905f82e1be0)
 - site.conf
   - disabled IPv4-only fastd
   - Changed MTU size to 1280
--- a/2
+++ b/2
@@ -3,7 +3,7 @@ node {
  checkout scm
  
  stage 'Build'
-  sh "make V=s"
+  sh "make sign V=s"
  
  stage 'Archive'
  archive 'output/**/*'
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git
-GLUON_GIT_REF := dddade25de0c20207385c339d66d3ac7b8092136
+GLUON_GIT_REF := 26b13e6c18bdb553413a1d9643dc48c2c4849191

 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

--- a/extra/ffmuc.conf
+++ b/extra/ffmuc.conf
@@ -150,7 +150,7 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
        },
      },
      experimental = {
@@ -165,7 +165,7 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
        },
      },
    },
--- a/extra/ffmuc_umland.conf
+++ b/extra/ffmuc_umland.conf
@@ -129,7 +129,7 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
        },
      },
      experimental = {
@@ -144,7 +144,7 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
        },
      },
    },
--- a/extra/ffmuc_welcome.conf
+++ b/extra/ffmuc_welcome.conf
@@ -122,7 +122,7 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
        },
      },
      experimental = {
@@ -137,7 +137,7 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
        },
      },
    },
--- a/4
+++ b/4
@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffmuc'

 PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_BRANCH=ath9k_wifi_fix
-PACKAGES_FFMUC_COMMIT=b8c2b7dd024d93bc7ceb552adbe8e20f0e68dc26
+PACKAGES_FFMUC_BRANCH=bf_2016.1_json
+PACKAGES_FFMUC_COMMIT=c734351ddbfb0d974d05f0f75e7ad660ec7ababe
--- a/site.conf
+++ b/site.conf
@@ -150,7 +150,7 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
        },
      },
      experimental = {
@@ -165,7 +165,7 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
        },
      },
    },
--- a/site.mk
+++ b/site.mk
@@ -26,10 +26,8 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged \
 	gluon-ebtables-filter-arp-ffmuc \
-	gluon-ebtables-filter-multicast-ffmuc \
-	tecff-ath9k-broken-wifi-workaround \
-	babeld \
-	ip
+	gluon-ebtables-filter-multicast-ffmuc
+

 # basic support for USB stack
 USB_PACKAGES_BASIC := \
Author	SHA1	Message	Date
Christian Obersteiner	b9f4f5e294	Jenkins shall sign the build	2016-06-26 16:08:31 +02:00
Christian Obersteiner	c4dc05826d	added key of new buildserver (build.ffmuc.net), removed old one	2016-06-26 15:43:56 +02:00