From e5934ce04fc1d3b0aec60a59f6cfb686294afe4f Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:37:15 +0100
Subject: [PATCH 1/3] fix indentions

---
 site.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/site.mk b/site.mk
index efd1464..4d57d91 100644
--- a/site.mk
+++ b/site.mk
@@ -1,7 +1,8 @@
 GLUON_MULTIDOMAIN := 1
 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-ebtables-source-filter \
 	gluon-web-mesh-vpn-fastd \
@@ -25,20 +26,20 @@ GLUON_FEATURES := \
 
 # EXTRA_SOFTWARE_TOOLS_01
 EXTRA_SOFTWARE_TOOLS_01 := \
-        nano \
-        htop \
-        ethtool
+	nano \
+	htop \
+	ethtool
 
 # x86
 ifeq ($(GLUON_TARGET),x86-generic)
 GLUON_SITE_PACKAGES += \
-    $(EXTRA_SOFTWARE_TOOLS_01)
+	$(EXTRA_SOFTWARE_TOOLS_01)
 endif
 
 # x86-64
 ifeq ($(GLUON_TARGET),x86-64)
 GLUON_SITE_PACKAGES += \
-    $(EXTRA_SOFTWARE_TOOLS_01)
+	$(EXTRA_SOFTWARE_TOOLS_01)
 endif
 
 GLUON_PRIORITY ?= 7

From cd90115c7461ec01ce9226689545658a7aba7e4b Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:40:00 +0100
Subject: [PATCH 2/3] gluon-radvd and gluon-ebtables-limit-arp are already in
 batman feature

---
 site.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/site.mk b/site.mk
index 4d57d91..7c9fbe0 100644
--- a/site.mk
+++ b/site.mk
@@ -15,10 +15,8 @@ GLUON_FEATURES := \
 	config-mode-domain-select \
 	ebtables-filter-multicast \
 	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
 	mesh-batman-adv-15 \
 	mesh-vpn-fastd \
-	radvd \
 	respondd \
 	status-page \
 	web-advanced \

From 553ba5c01e1498f58e0e61c14c79f2f7901b6732 Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:50:36 +0100
Subject: [PATCH 3/3] unify setting of extra software on x86-generic and x86-64

---
 site.mk | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/site.mk b/site.mk
index 7c9fbe0..aea0325 100644
--- a/site.mk
+++ b/site.mk
@@ -22,22 +22,12 @@ GLUON_FEATURES := \
 	web-advanced \
 	web-wizard
 
-# EXTRA_SOFTWARE_TOOLS_01
-EXTRA_SOFTWARE_TOOLS_01 := \
-	nano \
-	htop \
-	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)
+# x86 and x86-64 add extra software
+ifeq ($(GLUON_TARGET),$(filter $(GLUON_TARGET),x86-generic x86-64))
+	GLUON_SITE_PACKAGES += \
+		nano \
+		htop \
+		ethtool
 endif
 
 GLUON_PRIORITY ?= 7