Merge branch 'openwrt:master' into oonf-olsrd2-usable-default-config
This commit is contained in:
Patrick Grimm
GitHub
commit
2a9684e6e8
|
|
@ -6,12 +6,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=babeld
|
||||
PKG_VERSION:=1.12.1
|
||||
PKG_RELEASE:=$(AUTORELEASE)
|
||||
PKG_VERSION:=1.12.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/
|
||||
PKG_HASH:=9ab59d7ac741f3630df23f9c3b67c60294d8b34ab622398f9b89773a878ecb1e
|
||||
PKG_HASH:=1db22b6193070ea2450a1ab51196fd72f58a1329f780cb0388e2e4b2e7768cbb
|
||||
|
||||
PKG_MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>, \
|
||||
Baptiste Jonglez <openwrt-pkg@bitsofnetworks.org>, \
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=bird2
|
||||
PKG_VERSION:=2.0.11
|
||||
PKG_VERSION:=2.0.12
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
|
||||
PKG_HASH:=60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6
|
||||
PKG_HASH:=3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53
|
||||
|
||||
PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
|
||||
PKG_LICENSE:=GPL-2.0-or-later
|
||||
|
|
|
|||
|
|
@ -44,4 +44,16 @@
|
|||
The MPR plugin reduce the routing graph to limit the overhead of the OLSRv2 protocol
|
||||
default y
|
||||
|
||||
config OONF_OLSRV2_LAN
|
||||
bool "New config option for Locally attached entries"
|
||||
help
|
||||
Adds the 'lan' section to the config to configure LANs without setting multiple settings in a single key/value pair
|
||||
default y
|
||||
|
||||
config OONF_OLSRV2_OLD_LAN
|
||||
bool "Legacy option for Locally attached entries"
|
||||
help
|
||||
Adds the olsr 'lan' config key in the olsrv2 section
|
||||
default n
|
||||
|
||||
endmenu
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=oonf-olsrd2
|
||||
PKG_VERSION:=v0.15.1
|
||||
PKG_REV:=bffb88b040659b237c4c91b6b42dbbb47431750e
|
||||
PKG_RELEASE:=$(PKG_REV)
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||
PKG_MIRROR_HASH:=2e38140e804e7fc0138d0893416c4f19b1ca43bd9de066e8b028bd0d59ac9255
|
||||
PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
|
||||
PKG_SOURCE_DATE:=2022-08-25
|
||||
PKG_SOURCE_VERSION:=fb15d54d6a7a087cb0c5ec37c49804f6ce432396
|
||||
PKG_MIRROR_HASH:=e8b2e7890f7315694649bb26c22be09554cba3724bae5419ea047101a4f5d03d
|
||||
|
||||
CMAKE_INSTALL:=1
|
||||
|
||||
|
|
@ -27,6 +24,8 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \
|
|||
$(if $(filter y,$(CONFIG_OONF_GENERIC_REMOTECONTROL)),remotecontrol,) \
|
||||
$(if $(filter y,$(CONFIG_OONF_OLSRV2_MPR)),mpr,) \
|
||||
$(if $(filter y,$(CONFIG_OONF_GENERIC_HTTP)),http,) \
|
||||
$(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN)),olsrv2_lan,) \
|
||||
$(if $(filter y,$(CONFIG_OONF_OLSRV2_OLD_LAN)),olsrv2_old_lan,) \
|
||||
))
|
||||
|
||||
BUILD_TYPE:= $(if $(filter y,$(CONFIG_DEBUG)),Debug,Release)
|
||||
|
|
@ -38,8 +37,8 @@ CMAKE_OPTIONS+=-D CMAKE_BUILD_TYPE:String=$(BUILD_TYPE) \
|
|||
-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;${CMAKE_OPTIONAL_PLUGINS}" \
|
||||
-D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
|
||||
-D OONF_VERSION:String=$(PKG_VERSION) \
|
||||
-D OONF_LIB_GIT:String=$(PKG_SOURCE_VERSION) \
|
||||
-D VERSION_SUB_TAG:String=$(PKG_SOURCE_DATE) \
|
||||
-D INSTALL_LIB_DIR:Path=lib/oonf \
|
||||
-D INSTALL_INCLUDE_DIR:Path=include/oonf \
|
||||
-D INSTALL_CMAKE_DIR:Path=lib/oonf \
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
--- a/src-plugins/generic/nl80211_listener/nl80211_internal.h
|
||||
+++ b/src-plugins/generic/nl80211_listener/nl80211_internal.h
|
||||
@@ -49,6 +49,6 @@
|
||||
#include "core/oonf_logging.h"
|
||||
|
||||
/* headers only for use inside the NL80211 subsystem */
|
||||
-enum oonf_log_source LOG_NL80211;
|
||||
+extern enum oonf_log_source LOG_NL80211;
|
||||
|
||||
#endif /* NL80211_INTERNAL_H_ */
|
||||
--- a/src-plugins/nhdp/nhdp/nhdp_internal.h
|
||||
+++ b/src-plugins/nhdp/nhdp/nhdp_internal.h
|
||||
@@ -49,8 +49,8 @@
|
||||
#include "core/oonf_logging.h"
|
||||
|
||||
/* headers only for use inside the NHDP subsystem */
|
||||
-enum oonf_log_source LOG_NHDP;
|
||||
-enum oonf_log_source LOG_NHDP_R;
|
||||
-enum oonf_log_source LOG_NHDP_W;
|
||||
+extern enum oonf_log_source LOG_NHDP;
|
||||
+extern enum oonf_log_source LOG_NHDP_R;
|
||||
+extern enum oonf_log_source LOG_NHDP_W;
|
||||
|
||||
#endif /* NHDP_INTERNAL_H_ */
|
||||
--- a/src-plugins/olsrv2/olsrv2/olsrv2_internal.h
|
||||
+++ b/src-plugins/olsrv2/olsrv2/olsrv2_internal.h
|
||||
@@ -50,9 +50,9 @@
|
||||
#include "core/oonf_logging.h"
|
||||
|
||||
/* headers only for use inside the OLSRv2 subsystem */
|
||||
-EXPORT enum oonf_log_source LOG_OLSRV2;
|
||||
-EXPORT enum oonf_log_source LOG_OLSRV2_R;
|
||||
-EXPORT enum oonf_log_source LOG_OLSRV2_ROUTING;
|
||||
-EXPORT enum oonf_log_source LOG_OLSRV2_W;
|
||||
+EXPORT extern enum oonf_log_source LOG_OLSRV2;
|
||||
+EXPORT extern enum oonf_log_source LOG_OLSRV2_R;
|
||||
+EXPORT extern enum oonf_log_source LOG_OLSRV2_ROUTING;
|
||||
+EXPORT extern enum oonf_log_source LOG_OLSRV2_W;
|
||||
|
||||
#endif /* OLSRV2_INTERNAL_H_ */
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
--- a/src-plugins/nhdp/nhdp/nhdp.c
|
||||
+++ b/src-plugins/nhdp/nhdp/nhdp.c
|
||||
@@ -187,9 +187,9 @@ static struct oonf_rfc5444_protocol *_pr
|
||||
static struct netaddr _originator_v4, _originator_v6;
|
||||
|
||||
/* logging sources for NHDP subsystem */
|
||||
-static enum oonf_log_source LOG_NHDP;
|
||||
-static enum oonf_log_source LOG_NHDP_R;
|
||||
-static enum oonf_log_source LOG_NHDP_W;
|
||||
+enum oonf_log_source LOG_NHDP;
|
||||
+enum oonf_log_source LOG_NHDP_R;
|
||||
+enum oonf_log_source LOG_NHDP_W;
|
||||
|
||||
/**
|
||||
* Initialize additional logging sources for NHDP
|
||||
--- a/src-plugins/olsrv2/olsrv2/olsrv2.c
|
||||
+++ b/src-plugins/olsrv2/olsrv2/olsrv2.c
|
||||
@@ -255,10 +255,10 @@ static uint64_t _overwrite_tc_interval;
|
||||
static uint64_t _overwrite_tc_validity;
|
||||
|
||||
/* Additional logging sources */
|
||||
-static enum oonf_log_source LOG_OLSRV2;
|
||||
-static enum oonf_log_source LOG_OLSRV2_R;
|
||||
-static enum oonf_log_source LOG_OLSRV2_ROUTING;
|
||||
-static enum oonf_log_source LOG_OLSRV2_W;
|
||||
+enum oonf_log_source LOG_OLSRV2;
|
||||
+enum oonf_log_source LOG_OLSRV2_R;
|
||||
+enum oonf_log_source LOG_OLSRV2_ROUTING;
|
||||
+enum oonf_log_source LOG_OLSRV2_W;
|
||||
|
||||
/**
|
||||
* Initialize additional logging sources for NHDP
|
||||
Loading…
Reference in New Issue