update firmware signing keys to match 0.8.6

0.8.4.1 für das veraltete ffhh Netz
Update README.md with details about firmware versions
2018-01-23 21:37:38 +01:00 · 2018-01-12 22:56:54 +01:00 · 2017-10-07 11:45:50 +02:00 · 2017-10-06 21:00:37 +02:00 · 2017-10-06 21:00:03 +02:00 · 2017-10-02 21:59:31 +02:00
7 changed files with 44 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,4 @@
 *~
+/site.conf
+/site.mk
+/modules
--- a/18
+++ b/18
@ -0,0 +1,18 @@
+all: check_site site.mk site.conf modules
+
+.PHONY: check_site
+check_site:
+	if test -z "${SITE}"; then echo Usage: make SITE=ffhh; exit 1; else true; fi
+
+.PHONY: clean
+clean:
+	rm -f site.mk site.conf modules
+
+modules:
+	cp sites/${SITE}/$@ $@
+
+site.conf:
+	cp sites/${SITE}/$@ $@
+
+site.mk:
+	cp sites/${SITE}/$@ $@
--- a/README.md
+++ b/README.md
@ -3,6 +3,9 @@
    git clone https://github.com/freifunk-gluon/gluon.git            # Get the official Gluon repository
    cd gluon
    git clone https://github.com/freifunkhamburg/site-ffhh.git site  # Get the Freifunk Hamburg site repository
+    cd site
+    make SITE=ffhh
+    cd ..
    make update                                                    # Get other repositories used by Gluon
    make                                                           # Build Gluon

@ -11,6 +14,11 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu

 #### Gluon versions used for specific Hamburg Freifunk Firmware builds

+- 0.8.4.1: v2016.2.7 new package: ssid-changer
+- 0.8.4: v2016.2.7 (updated openwrt/package/network/services/dnsmasq/Makefile: PKG\_VERSION:=2.78 & PKG\_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4)
+- 0.8.3: v2016.2.6 (ffhh-sued only)
+- 0.8.2: v2016.2.5
+- 0.8.1: v2016.2.4 (ffhh-sued only)
 - 0.8: v2016.1.4
 - 0.7.1: v2015.1.2
 - 0.7: v2015.1
--- a/5
+++ b/5
@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffhh_packages'
-
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
-
--- a/sites/ffhh/modules
+++ b/sites/ffhh/modules
@ -0,0 +1,7 @@
+GLUON_SITE_FEEDS='ffhh_packages eulenfunk'
+
+PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
+
+PACKAGES_EULENFUNK_REPO=https://github.com/eulenfunk/packages.git
+PACKAGES_EULENFUNK_COMMIT=1951b97db14ca7b098db76cd6c64363a14de3903
--- a/sites/ffhh/site.conf
+++ b/sites/ffhh/site.conf
@ -122,11 +122,13 @@
 				mirrors = {'http://1.updates.services.ffhh/stable/sysupgrade','http://2.updates.services.ffhh/stable/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
-					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
 					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
+					'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
+					'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
 				},
 			},
 			beta = {
@ -134,11 +136,13 @@
 				mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
-					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
 					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
+					'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
+					'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
 				},
 			},
 			experimental = {
--- a/sites/ffhh/site.mk
+++ b/sites/ffhh/site.mk
@ -20,13 +20,14 @@ GLUON_SITE_PACKAGES := \
 	gluon-radvd \
 	gluon-respondd \
 	gluon-setup-mode \
+	gluon-ssid-changer \
 	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged


-DEFAULT_GLUON_RELEASE := 0.8+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.8.4.1

 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
Author	SHA1	Message	Date
Daniel Frank	2f58d59dfd	update firmware signing keys to match 0.8.6	2018-01-23 21:37:38 +01:00
Daniel Frank	2a9efe03eb	0.8.4.1 für das veraltete ffhh Netz	2018-01-12 22:56:54 +01:00
Daniel Frank	4ba875f5cd	Update README.md with details about firmware versions	2017-10-07 11:45:50 +02:00
Daniel Frank	f427c1023a	0.8.4 experimental -> stable	2017-10-06 21:00:37 +02:00
Daniel Frank	dbdde1f30a	0.8.4 experimental -> stable	2017-10-06 21:00:03 +02:00
Daniel Frank	22fb01a84f	0.8.4 experimental	2017-10-02 21:59:31 +02:00
bdobe	a108efaf18	ffhh-sued, site.conf: Fix opkg repository url	2017-09-15 23:10:20 +02:00
bdobe	6afc2a9358	ffhh-sued, site.conf: Add signing key for tokudan	2017-09-15 22:14:34 +02:00
bdobe	a8a7797831	Add site ffhh-sued config	2017-09-15 22:07:28 +02:00
bdobe	19f81f9635	Update gitignore	2017-09-15 22:07:27 +02:00
Björn Dobe	21842c39d0	Merge pull request #15 from tokudan/0.8.x Struktur fuer mehrere Sites anlegen	2017-09-15 21:27:34 +02:00
Daniel Frank	ac9a0cd277	Struktur fuer mehrere Sites anlegen	2017-09-15 21:24:35 +02:00
Daniel Frank	075459e28e	Preparation 0.8.3	2017-09-04 19:48:33 +02:00
Entil-Zha	374d91b8ea	Merge pull request #13 from tokudan/0.8.x Neuer key für tokudan	2017-09-04 19:35:28 +02:00
Daniel Frank	2ca0605cf4	Update site.conf	2017-09-04 19:30:10 +02:00
bdobe	7290bd7618	Release v0.8.2	2017-04-10 19:29:56 +02:00