summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Bittorf2015-06-30 12:38:16 +0000
committerBastian Bittorf2015-06-30 12:38:16 +0000
commitef436a6ed2883b85a06eb1542e33a631ffdd27cf (patch)
treefb4d146d61d6c1a3bf411235b71534730f483260
parent8a0a7fa06d404b699c862a69a9bf0492ec9362d6 (diff)
parenta8608be74ae365c8dd8263a89cdd2cf1ef83c9e5 (diff)
downloadrouting-ef436a6ed2883b85a06eb1542e33a631ffdd27cf.tar.gz
Merge pull request #108 from HRogge/master
Pull OONF v0.8.3
-rw-r--r--oonf-dlep-proxy/Makefile4
-rw-r--r--oonf-dlep-radio/Makefile4
-rw-r--r--oonf-olsrd2/Makefile6
3 files changed, 7 insertions, 7 deletions
diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index d84eeb3..115380c 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.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
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 72d8721..4eb6328 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.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
PKG_RELEASE:=$(PKG_REV)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 005905e..2717441 100644
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
PKG_RELEASE:=$(PKG_REV)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
-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_socket;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;json_for_networks" \
+ -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;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_LIB_GIT:String=v$(PKG_VERSION)-archive \
-D OONF_VERSION:String=$(PKG_VERSION) \
-D INSTALL_LIB_DIR:Path=lib/oonf \