From patchwork Mon Jan 28 10:07:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: packages/fff: add new fff-babeld package From: Fabian Blaese X-Patchwork-Id: 992 Message-Id: <20190128100724.46661-1-fabian@blaese.de> To: franken-dev@freifunk.net Date: Mon, 28 Jan 2019 11:07:24 +0100 From: Tim Niemeyer Signed-off-by: Tim Niemeyer Signed-off-by: Fabian Bläse - Convert configuration to uci - Split IPv4 network rules to fff specific subnets - Add IPv6 ULA network rules - Change PKG_VERSION to single number versioning Reviewed-by: Christian Dresel Reviewed-by: Adrian Schmutzler freifunk@adrianschmutzler.de --- buildscript | 2 +- src/packages/fff/fff-babeld/Makefile | 40 ++++++++++++++++ .../fff/fff-babeld/files/etc/config/babeld | 40 ++++++++++++++++ .../files/etc/uci-defaults/01-iproute | 3 ++ .../files/etc/uci-defaults/02-network-rules | 47 +++++++++++++++++++ 5 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 src/packages/fff/fff-babeld/Makefile create mode 100644 src/packages/fff/fff-babeld/files/etc/config/babeld create mode 100644 src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute create mode 100644 src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules diff --git a/buildscript b/buildscript index f8d435c..b85ff2a 100755 --- a/buildscript +++ b/buildscript @@ -40,7 +40,7 @@ ROUTING=(routing https://git.openwrt.org/feed/routing.git 1b9d1c419f0ecefda51922a7845ab2183d6acd76 "0002-Add-batman-adv-patch-to-remove-gw-mode-switch-messag.patch") # openwrt-18.06 from 2018-06-13 -ROUTING_PKGS="kmod-batman-adv batctl alfred" +ROUTING_PKGS="kmod-batman-adv batctl alfred babeld" FFF=(fff) FFF_PKGS="-a" diff --git a/src/packages/fff/fff-babeld/Makefile b/src/packages/fff/fff-babeld/Makefile new file mode 100644 index 0000000..c53841b --- /dev/null +++ b/src/packages/fff/fff-babeld/Makefile @@ -0,0 +1,40 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=fff-babeld +PKG_VERSION:=1 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-babeld + +include $(INCLUDE_DIR)/package.mk + +define Package/fff-babeld + SECTION:=base + CATEGORY:=Freifunk + TITLE:=Freifunk-Franken babeld configuration example + URL:=http://www.freifunk-franken.de + DEPENDS:=+babeld +endef + +define Package/fff-babeld/description + This is the Freifunk Franken Firmware babeld package. + This package provides an example babeld configuration. +endef + +define Build/Prepare + echo "all: " > $(PKG_BUILD_DIR)/Makefile +endef + +define Build/Configure + # nothing +endef + +define Build/Compile + # nothing +endef + +define Package/fff-babeld/install + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,fff-babeld)) diff --git a/src/packages/fff/fff-babeld/files/etc/config/babeld b/src/packages/fff/fff-babeld/files/etc/config/babeld new file mode 100644 index 0000000..a62788a --- /dev/null +++ b/src/packages/fff/fff-babeld/files/etc/config/babeld @@ -0,0 +1,40 @@ +config general + option export_table '10' + option import_table '10' + option first_table_number '100' + option local_port '33123' + +config interface + option type 'wired' + +config filter + option type 'redistribute' + option local 'true' + option ip '10.50.0.0/16' + +config filter + option type 'redistribute' + option local 'true' + option ip '10.83.0.0/16' + +config filter + option type 'redistribute' + option local 'true' + option ip 'fd43:5602:29bd::/48' + +config filter + option type 'redistribute' + option local 'true' + option action 'deny' + +config filter + option type 'redistribute' + option ip '10.50.0.0/16' + +config filter + option type 'redistribute' + option ip '10.83.0.0/16' + +config filter + option type 'redistribute' + option ip 'fd43:5602:29bd::/48' diff --git a/src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute b/src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute new file mode 100644 index 0000000..93d0574 --- /dev/null +++ b/src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "10 fff" >> /etc/iproute2/rt_tables diff --git a/src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules b/src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules new file mode 100644 index 0000000..094b04f --- /dev/null +++ b/src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules @@ -0,0 +1,47 @@ +#!/bin/sh + +uci batch <