diff options
| author | Henning Rogge <henning.rogge@fkie.fraunhofer.de> | 2017-06-13 10:59:44 +0200 |
|---|---|---|
| committer | Henning Rogge <henning.rogge@fkie.fraunhofer.de> | 2017-06-13 11:00:31 +0200 |
| commit | bd6c447b823e5f9c10ec56ea4b17f5a6a73fbc66 (patch) | |
| tree | 9dbc9b75ebacc65e2288e0e6c413fb51df38795c | |
| parent | e4b8715fb3e8662272a70f8696105250aa6b8310 (diff) | |
Update OONF to 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 | 6 | ||||
| -rw-r--r-- | oonf-olsrd2/Makefile | 10 |
4 files changed, 17 insertions, 7 deletions
diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 4b95171..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.14.0 -PKG_REV:=9863631659b28df7f9e507786ffb77f0ab2ef58e +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 1f4b359..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.14.0 -PKG_REV:=9863631659b28df7f9e507786ffb77f0ab2ef58e +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 8af701c..1cc037a 100644 --- a/oonf-olsrd2/Config.in +++ b/oonf-olsrd2/Config.in @@ -32,6 +32,12 @@ 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 diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index d77c530..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.14.0 -PKG_REV:=9863631659b28df7f9e507786ffb77f0ab2ef58e +PKG_VERSION:=0.14.1-1 +PKG_REV:=d86825c0bdf144db706da444be7b0a2e8722b54d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -25,9 +25,13 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ $(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 \ |