Browse Source

Update modules and site.mk (use features instead of specific packages)

Michael Schwarz 5 years ago
parent
commit
6c8ac6d089
2 changed files with 15 additions and 22 deletions
  1. 1 1
      modules
  2. 14 21
      site.mk

+ 1 - 1
modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
 PACKAGES_FFHO_BRANCH=master
-PACKAGES_FFHO_COMMIT=ca4cc1b87e47d3aba2e6af4ec725ec0f7f6abde3
+PACKAGES_FFHO_COMMIT=9a682395af19bc2f01450d6effb6e1be5bf93bf9

+ 14 - 21
site.mk

@@ -1,31 +1,25 @@
+GLUON_FEATURES := \
+        autoupdater \
+        ebtables-filter-multicast \
+        ebtables-filter-ra-dhcp \
+        ebtables-limit-arp \
+        mesh-batman-adv-15 \
+        mesh-vpn-fastd \
+        radvd \
+        respondd \
+        status-page \
+        web-advanced \
+        web-wizard
+
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
-	gluon-respondd \
+	-gluon-web-autoupdater \
 	ffho-ap-timer \
-	gluon-autoupdater \
 	ffho-autoupdater-wifi-fallback \
 	ffho-banner \
-	gluon-config-mode-core \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-contact-info \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
 	ffho-config-mode-site-select \
 	ffho-debug \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-source-filter \
-	gluon-mesh-vpn-fastd \
-	gluon-radvd \
-	gluon-setup-mode \
-	gluon-status-page \
-	gluon-web-admin \
 	ffho-web-ap-timer \
 	ffho-web-autoupdater \
-	gluon-web-logging \
-	gluon-web-network \
-	gluon-web-wifi-config \
 	iwinfo \
 	haveged
 
@@ -44,7 +38,6 @@ USB_NIC := \
 WLAN := \
 	kmod-ath9k \
 	kmod-ath10k-ct \
-	ath10k-firmware-qca988x-ct
 
 ifeq ($(GLUON_TARGET),x86-generic)
 	GLUON_SITE_PACKAGES += \