From 8a58147d3e0ffae21508bafae4203b6285bc1a30 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 14 May 2021 19:37:58 +0200 Subject: [PATCH] batctl: update to version 2021.1 * add various commands to print generic netlink replies as JSON * coding style cleanups and refactoring Signed-off-by: Sven Eckelmann --- batctl/Makefile | 34 +++++++++++++++++-- ...x-build-of-routing_algo-against-musl.patch | 25 -------------- 2 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 batctl/patches/0001-batctl-Fix-build-of-routing_algo-against-musl.patch diff --git a/batctl/Makefile b/batctl/Makefile index ea86720..6b10de6 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl -PKG_VERSION:=2021.0 +PKG_VERSION:=2021.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=9cec8bf1952f885192749a9dc0318a54633b717aaf05c438d504efd83f5201e4 +PKG_HASH:=44b28cebb46b8ba1bc170bedeef67f69d89503806c429ff8cb113cc01966e176 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Simon Wunderlich @@ -95,27 +95,37 @@ config-n := \ backbonetable \ bisect_iv \ bonding \ + bla_backbone_json \ + bla_claim_json \ bridge_loop_avoidance \ claimtable \ dat_cache \ + dat_cache_json \ distributed_arp_table \ elp_interval \ event \ fragmentation \ gateways \ + gateways_json \ gw_mode \ + hardif_json \ + hardifs_json \ hop_penalty \ interface \ isolation_mark \ loglevel \ mcast_flags \ + mcast_flags_json \ + mesh_json \ multicast_fanout \ multicast_forceflood \ multicast_mode \ neighbors \ + neighbors_json \ network_coding \ orig_interval \ originators \ + originators_json \ ping \ routing_algo \ statistics \ @@ -126,6 +136,9 @@ config-n := \ transglobal \ translate \ translocal \ + transtable_global_json \ + transtable_local_json \ + vlan_json \ config-settings := \ aggregation \ @@ -160,6 +173,21 @@ config-tables := \ transglobal \ translocal \ +config-json := \ + bla_backbone_json \ + bla_claim_json \ + dat_cache_json \ + gateways_json \ + hardif_json \ + hardifs_json \ + mcast_flags_json \ + mesh_json \ + neighbors_json \ + originators_json \ + transtable_global_json \ + transtable_local_json \ + vlan_json \ + config-tools := \ event \ ping \ @@ -183,6 +211,7 @@ ifeq ($(BUILD_VARIANT),default) config-y := \ $(config-settings) \ $(config-tables) \ + $(config-json) \ $(config-tools) \ endif @@ -192,6 +221,7 @@ ifeq ($(BUILD_VARIANT),full) config-y := \ $(config-settings) \ $(config-tables) \ + $(config-json) \ $(config-tools) \ $(config-extratools) \ diff --git a/batctl/patches/0001-batctl-Fix-build-of-routing_algo-against-musl.patch b/batctl/patches/0001-batctl-Fix-build-of-routing_algo-against-musl.patch deleted file mode 100644 index cd46966..0000000 --- a/batctl/patches/0001-batctl-Fix-build-of-routing_algo-against-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Sven Eckelmann -Date: Thu, 28 Jan 2021 20:44:22 +0100 -Subject: batctl: Fix build of routing_algo against musl - -glibc is including the headers for the rtnetlink functionality. But musl -avoids this indirect include. The headers must therefore be included -explicitely. - -Fixes: e0ccb9b575d9 ("batctl: Switch active routing algo list to netlink") -Signed-off-by: Sven Eckelmann -Origin: upstream, https://git.open-mesh.org/batctl.git/commit/b0044a6b2f8a762387d9b7408b1fe528f21c4ad7 - -diff --git a/routing_algo.c b/routing_algo.c -index 27458ffdd9b91decbecbe6ec5da8ffd14c863a35..b5e3ebb8c5a4743cd2c42634d79f8a4c6a8210db 100644 ---- a/routing_algo.c -+++ b/routing_algo.c -@@ -9,6 +9,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include