diff options
| author | Bastian Bittorf <bb@npl.de> | 2017-12-13 12:44:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-13 12:44:43 +0100 |
| commit | 04e09d75effbd20a419b4330115c92fe5fc12167 (patch) | |
| tree | 9dbc9b75ebacc65e2288e0e6c413fb51df38795c | |
| parent | 7626faa9fd7fba7639a04801ac687ad04a3dbf2a (diff) | |
| parent | bd6c447b823e5f9c10ec56ea4b17f5a6a73fbc66 (diff) | |
Merge pull request #308 from HRogge/for-12.09.xfor-12.09.x
OONF 0.14.1-1
| -rw-r--r-- | oonf-dlep-proxy/Makefile | 4 | ||||
| -rw-r--r-- | oonf-dlep-radio/Makefile | 4 | ||||
| -rw-r--r-- | oonf-olsrd2/Config.in | 12 | ||||
| -rw-r--r-- | oonf-olsrd2/Makefile | 11 |
4 files changed, 24 insertions, 7 deletions
diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 2f36eaa..28e16fd 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.13.0 -PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5 +PKG_VERSION:=0.14.1-1 +PKG_REV:=d86825c0bdf144db706da444be7b0a2e8722b54d 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 ac1f19c..4357e5b 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.13.0 -PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5 +PKG_VERSION:=0.14.1-1 +PKG_REV:=d86825c0bdf144db706da444be7b0a2e8722b54d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in index 7cda518..1cc037a 100644 --- a/oonf-olsrd2/Config.in +++ b/oonf-olsrd2/Config.in @@ -32,4 +32,16 @@ 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 diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 9b8e988..727bd16 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 -PKG_VERSION:=0.13.0 -PKG_REV:=9f941b25e1ac806db9d41e9892a5cf361bfe98f5 +PKG_VERSION:=0.14.1-1 +PKG_REV:=d86825c0bdf144db706da444be7b0a2e8722b54d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -24,9 +24,14 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ $(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_OPTIONS=-D OONF_NO_WERROR:Bool=true \ +BUILD_TYPE:= $(if $(filter y,$(CONFIG_DEBUG)),Debug,Release) + +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 \ |