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

merge commits from rubo77

Browse source
This commit is contained in:
Daniel Frank 2020-06-22 20:54:06 +02:00
commit 3eae036e64
Signed by: tokudan
GPG key ID: 063CCCAD04182D32
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
site.mk
View file

@ -1,7 +1,8 @@
GLUON_MULTIDOMAIN := 1 GLUON_MULTIDOMAIN := 1
GLUON_DEPRECATED := upgrade GLUON_DEPRECATED := upgrade
GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \ GLUON_SITE_PACKAGES := \
-gluon-config-mode-geo-location \
-gluon-config-mode-contact-info \ -gluon-config-mode-contact-info \
gluon-ebtables-source-filter \ gluon-ebtables-source-filter \
gluon-web-mesh-vpn-fastd \ gluon-web-mesh-vpn-fastd \
@ -14,33 +15,21 @@ GLUON_FEATURES := \
config-mode-domain-select \ config-mode-domain-select \
ebtables-filter-multicast \ ebtables-filter-multicast \
ebtables-filter-ra-dhcp \ ebtables-filter-ra-dhcp \
ebtables-limit-arp \
mesh-batman-adv-15 \ mesh-batman-adv-15 \
mesh-vpn-fastd \ mesh-vpn-fastd \
web-private-wifi \ web-private-wifi \
radvd \
radv-filterd \ radv-filterd \
respondd \ respondd \
status-page \ status-page \
web-advanced \ web-advanced \
web-wizard web-wizard
# EXTRA_SOFTWARE_TOOLS_01 # x86 and x86-64 add extra software
EXTRA_SOFTWARE_TOOLS_01 := \ ifeq ($(GLUON_TARGET),$(filter $(GLUON_TARGET),x86-generic x86-64))
GLUON_SITE_PACKAGES += \
nano \ nano \
htop \ htop \
ethtool ethtool
# x86
ifeq ($(GLUON_TARGET),x86-generic)
GLUON_SITE_PACKAGES += \
$(EXTRA_SOFTWARE_TOOLS_01)
endif
# x86-64
ifeq ($(GLUON_TARGET),x86-64)
GLUON_SITE_PACKAGES += \
$(EXTRA_SOFTWARE_TOOLS_01)
endif endif
GLUON_PRIORITY ?= 7 GLUON_PRIORITY ?= 7