forked from freifunk-franken/firmware
packages/fff: Merge meta packages for variants into config packages
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> Reviewed-by: Fabian Bläse <fabian@blaese.de>
This commit is contained in:
parent
6f132f858e
commit
2b77353685
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-gateway
|
PKG_NAME:=fff-gateway
|
||||||
PKG_RELEASE:=3
|
PKG_RELEASE:=4
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-gateway
|
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-gateway
|
||||||
|
|
||||||
|
@ -10,9 +10,29 @@ include $(INCLUDE_DIR)/package.mk
|
||||||
define Package/fff-gateway
|
define Package/fff-gateway
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:= Freifunk-Franken gateway configuration
|
TITLE:=Freifunk-Franken gateway configuration
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=https://www.freifunk-franken.de
|
||||||
DEPENDS:=+fff-boardname +fff-network
|
DEPENDS:=+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
|
endef
|
||||||
|
|
||||||
define Package/fff-gateway/description
|
define Package/fff-gateway/description
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-node
|
PKG_NAME:=fff-node
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-node
|
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-node
|
||||||
|
|
||||||
|
@ -10,8 +10,13 @@ include $(INCLUDE_DIR)/package.mk
|
||||||
define Package/fff-node
|
define Package/fff-node
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:= Freifunk-Franken node configuration
|
TITLE:=Freifunk-Franken node configuration
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=https://www.freifunk-franken.de
|
||||||
|
DEPENDS:=+fff-batman-adv \
|
||||||
|
+fff-fastd \
|
||||||
|
+fff-firewall \
|
||||||
|
+fff-hoods \
|
||||||
|
+fff-uradvd
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/fff-node/description
|
define Package/fff-node/description
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff
|
PKG_NAME:=fff
|
||||||
PKG_RELEASE:=6
|
PKG_RELEASE:=7
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/fff
|
PKG_BUILD_DIR:=$(BUILD_DIR)/fff
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
define Package/fff/base
|
define Package/fff-base
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken Base
|
TITLE:=Freifunk-Franken Base
|
||||||
|
@ -27,57 +27,10 @@ define Package/fff/base
|
||||||
+simple-tc
|
+simple-tc
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/fff/base/description
|
define Package/fff-base/description
|
||||||
This is the Freifunk Franken Firmware Base package
|
This is the Freifunk Franken Firmware Base package
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/fff-variant-node
|
$(eval $(call BuildPackage,fff-base))
|
||||||
$(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
|
include $(TOPDIR)/variant.mk
|
||||||
|
|
|
@ -4,7 +4,8 @@ define Package/fff-default
|
||||||
DEFAULT:=y
|
DEFAULT:=y
|
||||||
TITLE:=Freifunk-Franken Base default switcher
|
TITLE:=Freifunk-Franken Base default switcher
|
||||||
URL:=http://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+fff-variant-layer3
|
DEPENDS:=+fff-base +fff-gateway
|
||||||
|
VARIANT:=layer3
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/fff-default/description
|
define Package/fff-default/description
|
||||||
|
|
|
@ -4,7 +4,8 @@ define Package/fff-default
|
||||||
DEFAULT:=y
|
DEFAULT:=y
|
||||||
TITLE:=Freifunk-Franken Base default switcher
|
TITLE:=Freifunk-Franken Base default switcher
|
||||||
URL:=http://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+fff-variant-node
|
DEPENDS:=+fff-base +fff-node
|
||||||
|
VARIANT:=node
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/fff-default/description
|
define Package/fff-default/description
|
||||||
|
|
Loading…
Reference in New Issue