batctl: update to version 2024.0

[feed/routing.git] / batctl / Makefile

diff --git a/batctl/Makefile b/batctl/Makefile
index 6aebebb68babeb2da179a95288a3091b8f8264fa..c54231424456c648fb7a87c1931d34a03fbca0bf 100644 (file)
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -1,54 +1,50 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# SPDX-License-Identifier: GPL-2.0-only
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
-
-PKG_VERSION:=2019.4
-PKG_RELEASE:=0
-PKG_HASH:=a3564eb9727335352dc0cfa2f2b29474c2c837384689ac5fcb387784a56e7685
+PKG_VERSION:=2024.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
+PKG_HASH:=76853e87201af63c411db152fd0c625a729a9733115897d1331604e2c5a67c7d
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 PKG_LICENSE:=GPL-2.0-only ISC MIT
 PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT LICENSES/deprecated/ISC
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_FLAGS:=gc-sections lto
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/batctl/Default
-  URL:=https://www.open-mesh.org/
   SECTION:=net
   CATEGORY:=Network
+  URL:=https://www.open-mesh.org/
   DEPENDS:=+libnl-tiny +libc +librt
   PROVIDES:=batctl
-  MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 endef
 
 define Package/batctl/description
-batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced.
-It is an easier method for configuring batman-adv and provides some
-additional tools for debugging as well. This package builds
-version $(PKG_VERSION) of the user space utility.
+  batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced.
+  It is an easier method for configuring batman-adv and provides some
+  additional tools for debugging as well. This package builds
+  version $(PKG_VERSION) of the user space utility.
 endef
 
 define Package/batctl-tiny
 $(call Package/batctl/Default)
   TITLE:=B.A.T.M.A.N. Advanced user space configuration tool (Minimal)
   VARIANT:=tiny
-  PROVIDES:=batctl
   ALTERNATIVES:=100:/usr/sbin/batctl:/usr/libexec/batctl-tiny
 endef
 
 define Package/batctl-tiny/description
 $(Package/batctl/description)
-Only configuration relevant subcommands are enabled.
+  Only configuration relevant subcommands are enabled.
 endef
 
 define Package/batctl-default
@@ -60,7 +56,7 @@ endef
 
 define Package/batctl-default/description
 $(Package/batctl/description)
-Standard subcommands for configuration and online debugging are enabled.
+  Standard subcommands for configuration and online debugging are enabled.
 endef
 
 define Package/batctl-full
@@ -72,29 +68,15 @@ endef
 
 define Package/batctl-full/description
 $(Package/batctl/description)
-Subcommands for configuration, online and offline debugging are enabled.
+  Subcommands for configuration, online and offline debugging are enabled.
 endef
 
-# The linker can identify unused sections of a binary when each symbol is stored
-# in a separate section. This mostly removes unused linker sections and reduces
-# the size by ~3% on mipsel.
-
-TARGET_CFLAGS  += -ffunction-sections -fdata-sections
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-# Link-time optimization allows to move parts of the optimization from the single
-# source file to the global source view. This is done by emitting the GIMPLE
-# representation in each object file and analyzing it again during the link step.
-
-TARGET_CFLAGS  += -flto
-TARGET_LDFLAGS += -fuse-linker-plugin
-
 MAKE_VARS += \
         LIBNL_NAME="libnl-tiny" \
         LIBNL_GENL_NAME="libnl-tiny"
 
 MAKE_FLAGS += \
-        REVISION="openwrt-$(PKG_VERSION)-$(PKG_RELEASE)"
+        REVISION="$(PKG_VERSION)-openwrt-$(PKG_RELEASE)"
 
 config-n := \
        aggregation \
@@ -102,28 +84,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 \
-       nc_nodes \
        neighbors \
+       neighbors_json \
        network_coding \
        orig_interval \
        originators \
+       originators_json \
        ping \
        routing_algo \
        statistics \
@@ -134,6 +125,9 @@ config-n := \
        transglobal \
        translate \
        translocal \
+       transtable_global_json \
+       transtable_local_json \
+       vlan_json \
 
 config-settings := \
        aggregation \
@@ -161,14 +155,28 @@ config-tables := \
        claimtable \
        dat_cache \
        gateways \
-       loglevel \
-       nc_nodes \
+       mcast_flags \
        neighbors \
        originators \
        statistics \
        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 \
@@ -192,6 +200,7 @@ ifeq ($(BUILD_VARIANT),default)
 config-y := \
        $(config-settings) \
        $(config-tables) \
+       $(config-json) \
        $(config-tools) \
 
 endif
@@ -201,6 +210,7 @@ ifeq ($(BUILD_VARIANT),full)
 config-y := \
        $(config-settings) \
        $(config-tables) \
+       $(config-json) \
        $(config-tools) \
        $(config-extratools) \