packages/fff: move config scripts to fff-layer3-config

configuregateway and it's gateway.d files represent a specific
functionality that other packages depend on. Thus, it is put into
a package of its own so dependencies can be expressed more properly.

While at, use the chance to get rid of the ambiguous term "gateway"
and rename the script to configure-layer3 and the folders to layer3.d.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Christian Dresel <freifunk@dresel.systems>
This commit is contained in:
Adrian Schmutzler 2020-12-14 14:42:13 +01:00
parent e5da228cb1
commit f9a68be465
15 changed files with 49 additions and 6 deletions

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-babeld
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-babeld

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-dhcp
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-dhcp

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-gateway
PKG_RELEASE:=6
PKG_RELEASE:=7
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-gateway
@ -16,6 +16,7 @@ define Package/fff-gateway
+fff-babeld \
+fff-boardname \
+fff-dhcp \
+fff-layer3-config \
+fff-network \
+fff-ra \
+fff-wireguard \

View File

@ -0,0 +1,42 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-layer3-config
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-layer3-config
include $(INCLUDE_DIR)/package.mk
define Package/fff-layer3-config
SECTION:=base
CATEGORY:=Freifunk
TITLE:=Freifunk-Franken Layer3 firmware configuration tools
URL:=https://www.freifunk-franken.de
DEPENDS:= \
+fff-boardname \
+fff-config \
+fff-dhcp \
+fff-network
endef
define Package/fff-layer3-config/description
This package provides the means for configuring the gateway
endef
define Build/Prepare
echo "all: " > $(PKG_BUILD_DIR)/Makefile
endef
define Build/Configure
# nothing
endef
define Build/Compile
# nothing
endef
define Package/fff-layer3-config/install
$(CP) ./files/* $(1)/
endef
$(eval $(call BuildPackage,fff-layer3-config))

View File

@ -18,7 +18,7 @@ execute_subshell() {
echo "Usage:" "$0" "<function>"
fi
for script in /etc/gateway.d/*; do
for script in /etc/layer3.d/*; do
(
# unset function to prevent executing parents shell function
unset -f "$1"

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-wireguard
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-wireguard

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-wireless
PKG_RELEASE:=18
PKG_RELEASE:=19
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)