From 22040963a5241a382a604e3ec7150c06b7972395 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Thu, 5 May 2016 13:59:52 +0100 Subject: [PATCH 1/4] Add optional packages to OONF olsrd2 --- oonf-olsrd2/Config.in | 29 +++++++++++++++++++++++++++++ oonf-olsrd2/Makefile | 16 +++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 oonf-olsrd2/Config.in diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in new file mode 100644 index 0000000..f46831b --- /dev/null +++ b/oonf-olsrd2/Config.in @@ -0,0 +1,29 @@ + # OONF Olsrd2 configuration + menu "Optional Plugins" + depends on PACKAGE_oonf-olsrd2 + + config OONF_NHDP_AUTOLL4 + bool "Auto_LL4 plugin enabled" + help + The auto_ll4 plugin automatically generates linklocal IPv4 addresses on interfaces that do not contain IPv4 addresses. + default n + + config OONF_OLSRV2_LAN_IMPORT + bool "Lan_import plugin enabled" + help + The lan_import plugin can read routing tables and automatically export them as locally attached networks in olsrd2. + default n + + config OONF_OLSRV2_ROUTE_MODIFIER + bool "route_modifier plugin enabled" + help + The route_modifier plugin allows you to overwrite aspects of routes (like table/protocol) for certain destinations. + default n + + config OONF_GENERIC_DLEP_ROUTER + bool "dlep_router plugin enabled" + help + The dlep_router plugin can receive linklayer metadata over the DLEP protocol. + default n + + endmenu diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 20ee3b2..69cd97b 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -16,12 +16,21 @@ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk +SPACE:= +SPACE+= +CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ + $(if $(filter y,$(CONFIG_OONF_NHDP_AUTOLL4)),auto_ll4,) \ + $(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN_IMPORT)),lan_import,) \ + $(if $(filter y,$(CONFIG_OONF_OLSRV2_ROUTE_MODIFIER)),route_modifier,) \ + $(if $(filter y,$(CONFIG_OONF_GENERIC_DLEP_ROUTER)),dlep_router,) \ + )) + CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \ -D OONF_LOGGING_LEVEL:String=debug \ -D OONF_NO_TESTING:Bool=true \ -D UCI:Bool=true \ -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \ - -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo" \ + -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \ -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \ -D OONF_VERSION:String=$(PKG_VERSION) \ -D INSTALL_LIB_DIR:Path=lib/oonf \ @@ -35,6 +44,7 @@ define Package/oonf-git/template MAINTAINER:=Henning Rogge SUBMENU:=OLSR.org network framework URL:=http://www.olsr.org/ + MENU:=1 endef define Package/oonf-olsrd2 @@ -44,6 +54,10 @@ define Package/oonf-olsrd2 VERSION:=$(PKG_VERSION) endef +define Package/oonf-olsrd2/config + source "$(SOURCE)/Config.in" +endef + Build/Compile=$(call Build/Compile/Default,olsrd2_static) Build/Install= From 6b17ce6f61c7bf171610f7b360b6e42f3341c3dc Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Thu, 5 May 2016 14:21:03 +0100 Subject: [PATCH 2/4] Add remotecontrol plugin to selectable Olsrd2 plugins --- oonf-olsrd2/Config.in | 6 ++++++ oonf-olsrd2/Makefile | 1 + 2 files changed, 7 insertions(+) diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in index f46831b..7cda518 100644 --- a/oonf-olsrd2/Config.in +++ b/oonf-olsrd2/Config.in @@ -26,4 +26,10 @@ The dlep_router plugin can receive linklayer metadata over the DLEP protocol. default n + config OONF_GENERIC_REMOTECONTROL + bool "remotecontrol plugin enabled" + help + The remotecontrol plugin allows you to control configuration and logging over the telnet plugin. Be careful not to open this functionality over the network without securing it. + default n + endmenu diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 69cd97b..5a576d7 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -23,6 +23,7 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ $(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN_IMPORT)),lan_import,) \ $(if $(filter y,$(CONFIG_OONF_OLSRV2_ROUTE_MODIFIER)),route_modifier,) \ $(if $(filter y,$(CONFIG_OONF_GENERIC_DLEP_ROUTER)),dlep_router,) \ + $(if $(filter y,$(CONFIG_OONF_GENERIC_REMOTECONTROL)),remotecontrol,) \ )) CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \ From de014ca55f87daf2beb4c0cde7d12419f6af00e3 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Fri, 13 May 2016 10:48:35 +0200 Subject: [PATCH 3/4] Update OONF to 0.11.6 --- oonf-dlep-proxy/Makefile | 4 ++-- oonf-dlep-radio/Makefile | 4 ++-- oonf-olsrd2/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index e2cdccb..896ab9f 100644 --- a/oonf-dlep-proxy/Makefile +++ b/oonf-dlep-proxy/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-dlep-proxy -PKG_VERSION:=0.11.4 -PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7 +PKG_VERSION:=0.11.6 +PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile index b8e9762..fdb32e2 100644 --- a/oonf-dlep-radio/Makefile +++ b/oonf-dlep-radio/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-dlep-radio -PKG_VERSION:=0.11.4 -PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7 +PKG_VERSION:=0.11.6 +PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 5a576d7..698c558 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 -PKG_VERSION:=0.11.4 -PKG_REV:=a7087466958d3af477fecf4ad8e412ccca33d4c7 +PKG_VERSION:=0.11.6 +PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 From c57210d93cad0d0d4f444a80bf22077f2d962960 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Fri, 13 May 2016 15:00:12 +0200 Subject: [PATCH 4/4] Update OONF to v0.11.7 --- oonf-dlep-proxy/Makefile | 4 ++-- oonf-dlep-radio/Makefile | 4 ++-- oonf-olsrd2/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 896ab9f..c632158 100644 --- a/oonf-dlep-proxy/Makefile +++ b/oonf-dlep-proxy/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-dlep-proxy -PKG_VERSION:=0.11.6 -PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6 +PKG_VERSION:=0.11.7 +PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile index fdb32e2..b95e75d 100644 --- a/oonf-dlep-radio/Makefile +++ b/oonf-dlep-radio/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-dlep-radio -PKG_VERSION:=0.11.6 -PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6 +PKG_VERSION:=0.11.7 +PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 698c558..7f2219c 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 -PKG_VERSION:=0.11.6 -PKG_REV:=cabff22b492b52ec25a21822ac4bbcb626c7d7b6 +PKG_VERSION:=0.11.7 +PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2