freifunk/site-ffhh
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

upstream

Browse source 
Conflicts:
	README
	site.conf
	site.mk
This commit is contained in:
ohrensessel 2014-08-04 17:08:12 +02:00
commit 9119439ea9
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -11,6 +11,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds #### Gluon versions used for specific Hamburg Freifunk Firmware builds
- 0.5: v2014.3
- 0.4.2: v2014.2 - 0.4.2: v2014.2
- note: no gluon fork used anymore - note: no gluon fork used anymore
- 0.4.1: v2014.2-hh - 0.4.1: v2014.2-hh

3
site.conf
View file

@ -132,7 +132,6 @@
stable = { stable = {
name = 'stable', name = 'stable',
mirrors = {'http://1.updates.services.ffhh/stable/sysupgrade','http://2.updates.services.ffhh/stable/sysupgrade'}, mirrors = {'http://1.updates.services.ffhh/stable/sysupgrade','http://2.updates.services.ffhh/stable/sysupgrade'},
probability = 0.08,
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
@ -144,7 +143,6 @@
beta = { beta = {
name = 'beta', name = 'beta',
mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'}, mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'},
probability = 0.08,
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
@ -156,7 +154,6 @@
experimental = { experimental = {
name = 'experimental', name = 'experimental',
mirrors = {'http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'}, mirrors = {'http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'},
probability = 1.00,
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- 1.builder '1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- 1.builder

2
site.mk
View file

@ -20,7 +20,7 @@ GLUON_SITE_PACKAGES := \
haveged haveged
DEFAULT_GLUON_RELEASE := 0.4.2+0-exp$(shell date '+%Y%m%d') DEFAULT_GLUON_RELEASE := 0.5
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)