From 5074c6b08f0fcb48fe5d4d977b1a4069a34d220e Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sun, 3 Feb 2019 14:06:07 +0100 Subject: [PATCH] packages/fff: add layer3 variant Signed-off-by: Tim Niemeyer Reviewed-by: Adrian Schmutzler --- src/packages/fff/fff/Makefile | 59 ++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile index dce33f9..5aec344 100644 --- a/src/packages/fff/fff/Makefile +++ b/src/packages/fff/fff/Makefile @@ -2,17 +2,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff PKG_VERSION:=0.0.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_BUILD_DIR:=$(BUILD_DIR)/fff include $(INCLUDE_DIR)/package.mk -define Package/fff-base +define Package/fff/base SECTION:=base CATEGORY:=Freifunk - DEFAULT:=y - TITLE:= Freifunk-Franken Base + TITLE:=Freifunk-Franken Base URL:=http://www.freifunk-franken.de DEPENDS:=+iptables \ +ip6tables \ @@ -21,37 +20,59 @@ define Package/fff-base +fff-config \ +fff-nodewatcher \ +fff-web \ - +fff-uradvd \ +fff-batman-adv \ - +fff-firewall \ +fff-support \ +fff-network \ +fff-sysupgrade \ +fff-wireless \ +fff-timeserver \ - +fff-vpn-select \ - +simple-tc \ - +fff-hoods + +simple-tc endef -define Package/fff-base/description +define Package/fff/base/description This is the Freifunk Franken Firmware Base package endef -define Build/Prepare - echo "all: " > $(PKG_BUILD_DIR)/Makefile +define Package/fff-node + $(call Package/fff/base) + DEFAULT:=y + TITLE+=(Home node) + DEPENDS+=+fff-fastd \ + +fff-firewall \ + +fff-vpn-select \ + +fff-uradvd \ + +fff-hoods + VARIANT:=homenode endef -define Build/Configure - # nothing +define Package/fff-node/description + $(call Package/fff/base/description) endef -define Build/Compile - # nothing +define Package/fff-layer3 + $(call Package/fff/base) + TITLE+=(Layer 3 Gateway) + DEPENDS+=+fff-dhcp \ + +fff-babeld \ + +fff-ra \ + +arptables \ + +ebtables \ + +ebtables-utils \ + +kmod-ebtables-ipv4 \ + +kmod-ebtables-ipv6 \ + +iptables-mod-filter \ + +iptables-mod-ipopt \ + +iptables-mod-conntrack-extra \ + +gre \ + +@PACKAGE_grev4 \ + +@PACKAGE_grev6 \ + +fff-alfred-monitoring-proxy + VARIANT:=layer3 endef -define Package/fff-base/install - # nothing +define Package/fff-layer3/description + $(call Package/fff/base/description) endef -$(eval $(call BuildPackage,fff-base)) +$(eval $(call BuildPackage,fff-node)) +$(eval $(call BuildPackage,fff-layer3))