Update OpenWRT GIT Build Files
authorHenning Rogge <hrogge@gmail.com>
Thu, 8 Jun 2017 18:15:54 +0000 (20:15 +0200)
committerHenning Rogge <hrogge@gmail.com>
Thu, 8 Jun 2017 18:15:54 +0000 (20:15 +0200)
openwrt/oonf-olsrd2-git-debug/Config.in [new file with mode: 0644]
openwrt/oonf-olsrd2-git-debug/Makefile
openwrt/oonf-olsrd2-git/Config.in [new file with mode: 0644]
openwrt/oonf-olsrd2-git/Makefile

diff --git a/openwrt/oonf-olsrd2-git-debug/Config.in b/openwrt/oonf-olsrd2-git-debug/Config.in
new file mode 100644 (file)
index 0000000..1cc037a
--- /dev/null
@@ -0,0 +1,47 @@
+       # 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
+
+       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
+
+       config OONF_GENERIC_HTTP
+               bool "http plugin enabled"
+               help
+                       The HTTP plugin allows HTTP access to all telnet commands.
+               default n
+
+       config OONF_OLSRV2_MPR
+               bool "MPR plugin enabled"
+               help
+                       The MPR plugin reduce the routing graph to limit the overhead of the OLSRv2 protocol
+               default n
+
+       endmenu
index 7140674..6d23c86 100644 (file)
@@ -1,25 +1,39 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2-git-debug
-PKG_VERSION:=2016-05-31
+PKG_VERSION:=2017-06-08
 
 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,) \
+        $(if $(filter y,$(CONFIG_OONF_GENERIC_REMOTECONTROL)),remotecontrol,) \
+        $(if $(filter y,$(CONFIG_OONF_OLSRV2_MPR)),mpr,) \
+        $(if $(filter y,$(CONFIG_OONF_GENERIC_HTTP)),http,) \
+    ))
+
 CMAKE_SOURCE_DIR=$(CURDIR)/../../
-CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
+CMAKE_OPTIONS=-D CMAKE_BUILD_TYPE:String=Debug \
+              -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;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;lan_import;auto_ll4" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;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 \
               -D INSTALL_INCLUDE_DIR:Path=include/oonf \
               -D INSTALL_CMAKE_DIR:Path=lib/oonf \
-              -D CMAKE_PREFIX_PATH=$(STAGING_DIR)/usr \
-              -D CMAKE_BUILD_TYPE:String=Debug
+              -D CMAKE_PREFIX_PATH=$(STAGING_DIR)/usr
 
 define Package/oonf-git/template
        SECTION:=net
@@ -27,15 +41,20 @@ 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-git-debug
-       $(call Package/oonf-git/template) 
+       $(call Package/oonf-git/template)
        TITLE:= Build Olsrd V2 Routing Agent
        DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
        VERSION:=$(PKG_VERSION)
 endef
 
+define Package/oonf-olsrd2-git-debug/config
+       source "$(SOURCE)/Config.in"
+endef
+
 Build/Compile=$(call Build/Compile/Default,olsrd2_static)
 Build/Install=
 
diff --git a/openwrt/oonf-olsrd2-git/Config.in b/openwrt/oonf-olsrd2-git/Config.in
new file mode 100644 (file)
index 0000000..1cc037a
--- /dev/null
@@ -0,0 +1,47 @@
+       # 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
+
+       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
+
+       config OONF_GENERIC_HTTP
+               bool "http plugin enabled"
+               help
+                       The HTTP plugin allows HTTP access to all telnet commands.
+               default n
+
+       config OONF_OLSRV2_MPR
+               bool "MPR plugin enabled"
+               help
+                       The MPR plugin reduce the routing graph to limit the overhead of the OLSRv2 protocol
+               default n
+
+       endmenu
index 51ba933..b70bdb9 100644 (file)
@@ -1,20 +1,37 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2-git
-PKG_VERSION:=2016-05-31
+PKG_VERSION:=2017-06-08
 
 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,) \
+        $(if $(filter y,$(CONFIG_OONF_GENERIC_REMOTECONTROL)),remotecontrol,) \
+        $(if $(filter y,$(CONFIG_OONF_OLSRV2_MPR)),mpr,) \
+        $(if $(filter y,$(CONFIG_OONF_GENERIC_HTTP)),http,) \
+    ))
+
+BUILD_TYPE:= $(if $(filter y,$(CONFIG_DEBUG)),Debug,Release)
+
 CMAKE_SOURCE_DIR=$(CURDIR)/../../
-CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
+CMAKE_OPTIONS=-D CMAKE_BUILD_TYPE:String=$(BUILD_TYPE) \
+              -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;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;lan_import;auto_ll4" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;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 \
               -D INSTALL_INCLUDE_DIR:Path=include/oonf \
               -D INSTALL_CMAKE_DIR:Path=lib/oonf \
@@ -26,15 +43,20 @@ 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-git
-       $(call Package/oonf-git/template) 
+       $(call Package/oonf-git/template)
        TITLE:= Build Olsrd V2 Routing Agent
        DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
        VERSION:=$(PKG_VERSION)
 endef
 
+define Package/oonf-olsrd2-git/config
+       source "$(SOURCE)/Config.in"
+endef
+
 Build/Compile=$(call Build/Compile/Default,olsrd2_static)
 Build/Install=