mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-28 21:11:41 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/batman-adv: bump version to 2025.4

Browse Source 
Changelog:
https://git.open-mesh.org/batman-adv.git/tree/CHANGELOG.rst?h=v2025.4

Removed patch which is included in this release.

Upstream removed network coding support:
https://git.open-mesh.org/batman-adv.git/commit/?id=2cefbadba8b2c547058b7d2e5da96692ef3580d7
Add legacy support for the corresponding Config.in option.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2025-11-16 19:47:21 +01:00
committed by Julien Olivain
parent a7a56546e2
commit f8c7a40015
5 changed files with 11 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2025.11"
config BR2_PACKAGE_BATMAN_ADV_NC
bool "batman-adv removed network coding"
select BR2_LEGACY
help
batman-adv removed B.A.T.M.A.N. network coding
config BR2_PACKAGE_DVBSNOOP
bool "dvbsnoop has been removed"
select BR2_LEGACY

39
package/batman-adv/0001-batman-adv-Reorder-includes-for-distributed-arp-tabl.patch
View File

@@ -1,39 +0,0 @@
From dc072c88ef0eaa80215dbc25923678c6a3d46e25 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Wed, 16 Oct 2024 09:23:06 +0200
Subject: [PATCH] batman-adv: Reorder includes for distributed-arp-table.c
The commit ee60832ebec4 ("batman-adv: move asm/unaligned.h to
linux/unaligned.h") changed the include without adjusting the order (to
match the rest of the file).
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Upstream: https://git.open-mesh.org/batman-adv.git/commit/fd3a0eff09429719e61e60b7dc3d2a373183a5ad
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
net/batman-adv/distributed-arp-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 801eff8a..48b72c2b 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -7,7 +7,6 @@
#include "distributed-arp-table.h"
#include "main.h"
-#include <linux/unaligned.h>
#include <linux/atomic.h>
#include <linux/bitops.h>
#include <linux/byteorder/generic.h>
@@ -32,6 +31,7 @@
#include <linux/stddef.h>
#include <linux/string.h>
#include <linux/udp.h>
+#include <linux/unaligned.h>
#include <linux/workqueue.h>
#include <net/arp.h>
#include <net/genetlink.h>
--
2.47.1

8
package/batman-adv/Config.in
View File

@@ -18,14 +18,6 @@ config BR2_PACKAGE_BATMAN_ADV_DEBUG
help
Enables B.A.T.M.A.N. debugging.
config BR2_PACKAGE_BATMAN_ADV_NC
bool "enable network coding"
help
Enables B.A.T.M.A.N. network coding.
Note: this requires promiscuous mode on ALL nodes!
https://www.open-mesh.org/projects/batman-adv/wiki/NetworkCoding
config BR2_PACKAGE_BATMAN_ADV_BATMAN_V
bool "enable B.A.T.M.A.N. V protocol"
default y

6
package/batman-adv/batman-adv.hash
View File

@@ -1,7 +1,7 @@
# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.4.tar.gz.sha1
sha1 36bdc78a00bfa51d8afa689be1b651b9da9f8860 batman-adv-2024.4.tar.gz
# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2025.4.tar.gz.sha1
sha1 ec1e431bda8bd6988e25a54ab18b5ff127fabded batman-adv-2025.4.tar.gz
# locally computed
sha256 a554df6fc7abccc6b243f56ea7b184486c95ea986db1133f87aafe237da92f21 batman-adv-2024.4.tar.gz
sha256 62490a8f8b58c02e819216f3e963249984645d3e460156a043b73fc53e24f86d batman-adv-2025.4.tar.gz
# Hash for license files
sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0

5
package/batman-adv/batman-adv.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
BATMAN_ADV_VERSION = 2024.4
BATMAN_ADV_VERSION = 2025.4
BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
@@ -25,8 +25,7 @@ BATMAN_ADV_MODULE_MAKE_OPTS = \
CONFIG_BATMAN_ADV_DAT=y \
CONFIG_BATMAN_ADV_MCAST=y \
CONFIG_BATMAN_ADV_BATMAN_V=$(if $(BR2_PACKAGE_BATMAN_ADV_BATMAN_V),y,n) \
CONFIG_BATMAN_ADV_DEBUG=$(if $(BR2_PACKAGE_BATMAN_ADV_DEBUG),y,n) \
CONFIG_BATMAN_ADV_NC=$(if $(BR2_PACKAGE_BATMAN_ADV_NC),y,n)
CONFIG_BATMAN_ADV_DEBUG=$(if $(BR2_PACKAGE_BATMAN_ADV_DEBUG),y,n)
BATMAN_ADV_MODULE_SUBDIRS = net/batman-adv