Add optional packages to OONF olsrd2

diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in
new file mode 100644 (file)
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 20ee3b23a1595d391dfd70404f547b3f7758a49f..69cd97bf7964a44d04571a20e421cae1e4332f41 100644 (file)
--- 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 <hrogge@gmail.com>
        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=