@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-gateway
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-gateway
@@ -10,9 +10,31 @@ include $(INCLUDE_DIR)/package.mk
define Package/fff-gateway
SECTION:=base
CATEGORY:=Freifunk
- TITLE:= Freifunk-Franken gateway configuration
+ TITLE:=Freifunk-Franken gateway configuration
+ VARIANT:=layer3
URL:=https://www.freifunk-franken.de
- DEPENDS:=+fff-boardname +fff-network
+ DEPENDS:=+fff-base \
+ +fff-alfred-monitoring-proxy \
+ +fff-babeld \
+ +fff-boardname \
+ +fff-dhcp \
+ +fff-network \
+ +fff-ra \
+ +fff-wireguard \
+ +arptables \
+ +ebtables \
+ +ebtables-utils \
+ +kmod-ebtables-ipv4 \
+ +kmod-ebtables-ipv6 \
+ +gre \
+ +@PACKAGE_grev4 \
+ +@PACKAGE_grev6 \
+ +iperf3 \
+ +ip-full \
+ +iptables-mod-filter \
+ +iptables-mod-ipopt \
+ +iptables-mod-conntrack-extra \
+ +tcpdump
endef
define Package/fff-gateway/description
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-node
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-node
@@ -10,8 +10,15 @@ include $(INCLUDE_DIR)/package.mk
define Package/fff-node
SECTION:=base
CATEGORY:=Freifunk
- TITLE:= Freifunk-Franken node configuration
+ TITLE:=Freifunk-Franken node configuration
+ VARIANT:=homenode
URL:=https://www.freifunk-franken.de
+ DEPENDS:=+fff-base \
+ +fff-batman-adv \
+ +fff-fastd \
+ +fff-firewall \
+ +fff-hoods \
+ +fff-uradvd
endef
define Package/fff-node/description
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff
-PKG_RELEASE:=6
+PKG_RELEASE:=7
PKG_BUILD_DIR:=$(BUILD_DIR)/fff
@@ -31,53 +31,4 @@ define Package/fff/base/description
This is the Freifunk Franken Firmware Base package
endef
-define Package/fff-variant-node
- $(call Package/fff/base)
- TITLE+=(Home node)
- DEPENDS+=+fff-node \
- +fff-fastd \
- +fff-firewall \
- +fff-uradvd \
- +fff-batman-adv \
- +fff-hoods
- VARIANT:=homenode
-endef
-
-define Package/fff-variant-node/description
- $(call Package/fff/base/description)
-endef
-
-define Package/fff-variant-layer3
- $(call Package/fff/base)
- TITLE+=(Layer 3 Gateway)
- DEPENDS+=+fff-gateway \
- +fff-dhcp \
- +fff-babeld \
- +fff-ra \
- +fff-wireguard \
- +iperf3 \
- +ip-full \
- +tcpdump \
- +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-variant-layer3/description
- $(call Package/fff/base/description)
-endef
-
-$(eval $(call BuildPackage,fff-variant-node))
-$(eval $(call BuildPackage,fff-variant-layer3))
-
include $(TOPDIR)/variant.mk
@@ -4,7 +4,7 @@ define Package/fff-default
DEFAULT:=y
TITLE:=Freifunk-Franken Base default switcher
URL:=http://www.freifunk-franken.de
- DEPENDS:=+fff-variant-layer3
+ DEPENDS:=+fff-gateway
endef
define Package/fff-default/description
@@ -4,7 +4,7 @@ define Package/fff-default
DEFAULT:=y
TITLE:=Freifunk-Franken Base default switcher
URL:=http://www.freifunk-franken.de
- DEPENDS:=+fff-variant-node
+ DEPENDS:=+fff-node
endef
define Package/fff-default/description
So far, we have meta packages and config packages for the variants in parallel, e.g. fff-node and fff-variant-node. Since the sole purpose of the meta packages is to define dependencies, one can just merge them into the corresponding config packages to reduce overhead. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-gateway/Makefile | 28 ++++++++++++-- src/packages/fff/fff-node/Makefile | 11 +++++- src/packages/fff/fff/Makefile | 51 +------------------------- src/packages/fff/fff/variant-layer3.mk | 2 +- src/packages/fff/fff/variant-node.mk | 2 +- 5 files changed, 37 insertions(+), 57 deletions(-)