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

Merge branch 'master' of https://github.com/freifunk-gluon/site-ffhl

Browse source 
Conflicts:
	site.mk
This commit is contained in:
ohrensessel 2014-08-07 17:41:02 +02:00
commit d3b18157dc
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
site.mk
View file

@ -2,7 +2,9 @@ GLUON_SITE_PACKAGES := \
gluon-alfred \ gluon-alfred \
gluon-announced \ gluon-announced \
gluon-autoupdater \ gluon-autoupdater \
gluon-config-mode-ffhh \ gluon-config-mode-autoupdater \
gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-filter-ra-dhcp \
gluon-legacy \ gluon-legacy \
@ -19,7 +21,7 @@ GLUON_SITE_PACKAGES := \
haveged haveged
DEFAULT_GLUON_RELEASE := 0.5 DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d')
# 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)