From 71d0a0b58a6607cd3140468e8508420d421ea2d4 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Tue, 6 Jun 2017 16:47:27 +0200 Subject: [PATCH 1/7] Add v0.14.0 OONF --- oonf-dlep-proxy/Makefile | 4 ++-- oonf-dlep-radio/Makefile | 4 ++-- oonf-olsrd2/Config.in | 6 ++++++ oonf-olsrd2/Makefile | 5 +++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 2f36eaa..4b95171 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.0 +PKG_REV:=9863631659b28df7f9e507786ffb77f0ab2ef58e 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..1f4b359 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.0 +PKG_REV:=9863631659b28df7f9e507786ffb77f0ab2ef58e 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..8af701c 100644 --- a/oonf-olsrd2/Config.in +++ b/oonf-olsrd2/Config.in @@ -32,4 +32,10 @@ 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_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..d77c530 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.0 +PKG_REV:=9863631659b28df7f9e507786ffb77f0ab2ef58e PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -24,6 +24,7 @@ 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,) \ )) CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \ From cfb3e9525146d8c383e6e6d4a3b5bec7032e1573 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Wed, 7 Jun 2017 21:49:05 +0200 Subject: [PATCH 2/7] Allow HTTP Plugin --- 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 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..aee6224 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -25,6 +25,7 @@ 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,$(OONF_GENERIC_HTTP)),http,) \ )) CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \ From 5a9cd902ab002c97fc33f010b0042922ab217f86 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Thu, 8 Jun 2017 12:40:44 +0200 Subject: [PATCH 3/7] Fix http plugin option for olsrd2 --- oonf-olsrd2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index aee6224..f744861 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -25,7 +25,7 @@ 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,$(OONF_GENERIC_HTTP)),http,) \ + $(if $(filter y,$(CONFIG_OONF_GENERIC_HTTP)),http,) \ )) CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \ From 560504b85200527c6570dc920ec37dae73d096a0 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Thu, 8 Jun 2017 19:06:40 +0200 Subject: [PATCH 4/7] Control build type by CONFIG_DEBUG option --- oonf-olsrd2/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index f744861..c9d3d52 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -28,7 +28,10 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ $(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 \ From 565cd8d4f9ee1f6b890427a3d5b20257cb5aab83 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Thu, 8 Jun 2017 20:27:17 +0200 Subject: [PATCH 5/7] v0.14.1 --- oonf-olsrd2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index c9d3d52..89499f1 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 +PKG_REV:=8a310f25eeb3e7cc28a8be01b3ccb4e9d0fd16c8 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 From 4c7624017c3a3dcc015a0bf582373aa47ca8ea01 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Fri, 9 Jun 2017 15:28:43 +0200 Subject: [PATCH 6/7] Update 0.14.1 release --- oonf-olsrd2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 89499f1..b4ef14f 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 PKG_VERSION:=0.14.1 -PKG_REV:=8a310f25eeb3e7cc28a8be01b3ccb4e9d0fd16c8 +PKG_REV:=279168a87b5cb5d612c8d2981f45e23dee722933 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 From bb8271c304d55ca1a1d7b8914c6206f65799d902 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Tue, 13 Jun 2017 10:56:49 +0200 Subject: [PATCH 7/7] Update OONF to 0.14.1-1 --- 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 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/Makefile b/oonf-olsrd2/Makefile index b4ef14f..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.1 -PKG_REV:=279168a87b5cb5d612c8d2981f45e23dee722933 +PKG_VERSION:=0.14.1-1 +PKG_REV:=d86825c0bdf144db706da444be7b0a2e8722b54d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2