sprinterfreak/site-ffrgb-dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

site.conf indentation, gluon release set to last of 2016.2.x branch

Browse Source
This commit is contained in:
Bastian 2018-01-15 15:25:27 +01:00
parent c062dc13ff
commit 7c8e8d63d0
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/ffrgb/gluon GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
GLUON_GIT_REF := v2016.2.7 GLUON_GIT_REF := 3d824bd21d7f6d5db6dc238d2a68b62de471aa2a
#https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
@ -17,8 +17,8 @@ GLUON_TARGETS ?= \
x86-64 \ x86-64 \
x86-generic \ x86-generic \
sunxi \ sunxi \
x86-kvm_guest x86-kvm_guest
GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
@ -53,7 +53,7 @@ build: gluon-prepare
${GLUON_MAKE} GLUON_TARGET="$$target"; \ ${GLUON_MAKE} GLUON_TARGET="$$target"; \
done done
buildonly: buildonly:
for target in ${GLUON_TARGETS}; do \ for target in ${GLUON_TARGETS}; do \
echo ""Building target $$target""; \ echo ""Building target $$target""; \
${GLUON_MAKE} GLUON_TARGET="$$target"; \ ${GLUON_MAKE} GLUON_TARGET="$$target"; \

2
extra/sites.conf
View File

@ -33,7 +33,7 @@
}, },
{ {
site_name = 'Freifunk Regensburg - Legacy', site_name = 'Freifunk Regensburg - Legacy',
site_code = 'ffrgb_legacy', site_code = 'ffrgb',
subst = { subst = {
['%%SS'] = 'regensburg.freifunk.net', ['%%SS'] = 'regensburg.freifunk.net',
}, },

6
site.conf
View File

@ -97,7 +97,7 @@
pubkeys = { pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver 'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
}, },
}, },
experimental = { experimental = {
@ -108,8 +108,8 @@
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver 'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
}, },
}, },
}, },

9
site.mk
View File

@ -1,6 +1,5 @@
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-15 \ gluon-mesh-batman-adv-15 \
gluon-alfred \
gluon-respondd \ gluon-respondd \
gluon-autoupdater \ gluon-autoupdater \
gluon-config-mode-core \ gluon-config-mode-core \
@ -28,9 +27,11 @@ GLUON_SITE_PACKAGES := \
gluon-ebtables-filter-arp-ffmuc \ gluon-ebtables-filter-arp-ffmuc \
gluon-ebtables-filter-multicast-ffmuc \ gluon-ebtables-filter-multicast-ffmuc \
gluon-ssid-changer \ gluon-ssid-changer \
respondd-module-airtime \ ffrgb-banner \
ffho-config-mode-site-select \ respondd-module-airtime #\
ffho-site-generate #ffho-site-generate \
#ffho-config-mode-site-select \
# basic support for USB stack # basic support for USB stack
USB_PACKAGES_BASIC := \ USB_PACKAGES_BASIC := \