Skip to content

batman-adv: update packages to version 2025.5 #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonwunderlich merged 4 commits into from
Dec 21, 2025
Merged

batman-adv: update packages to version 2025.5 #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8bd615
batman-adv: update to version 2025.5
ecsv Dec 20, 2025
1d4204a
alfred: update to version 2025.5
ecsv Dec 20, 2025
091138d
batctl: update to version 2025.5
ecsv Dec 20, 2025
e8d322e
batman-adv: drop support for kernels < 6.12
ecsv Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions alfred/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=alfred
PKG_VERSION:=2025.4
PKG_RELEASE:=2
PKG_VERSION:=2025.5
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:=8375475478ed1cd4139c9000175a7d1407ee8dd919a0b7c9dbf7d15095880485
PKG_HASH:=75c12c1c3c39cdb2246f61fca5d4d9f61e240fe2827129fab7a03deef855ffe8

PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
PKG_LICENSE:=GPL-2.0-only MIT
Expand Down
4 changes: 2 additions & 2 deletions batctl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=batctl
PKG_VERSION:=2025.4
PKG_VERSION:=2025.5
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:=566aa4fd74355e8d5dd2bd21c25e98cc068e77fd08e19f80b8e2b5edde7c8e65
PKG_HASH:=1e0bcd49f92eeda0d76bc683562adf366024e2ee4c199fa402036f6b93cbb147
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
Expand Down
6 changes: 3 additions & 3 deletions batman-adv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=batman-adv
PKG_VERSION:=2025.4
PKG_RELEASE:=1
PKG_VERSION:=2025.5
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
PKG_HASH:=62490a8f8b58c02e819216f3e963249984645d3e460156a043b73fc53e24f86d
PKG_HASH:=1adbe823991e9718e307f3766ea96405fe1f284c19bcb98c662d7a1faa324c35
PKG_EXTMOD_SUBDIRS:=net/batman-adv

PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
Expand Down
69 changes: 0 additions & 69 deletions batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch
View file
Open in desktop

This file was deleted.

36 changes: 30 additions & 6 deletions batman-adv/src/compat-hacks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
#include <linux/version.h> /* LINUX_VERSION_CODE */
#include <linux/types.h>

#if LINUX_VERSION_IS_LESS(6, 10, 0)

#define __counted_by_be(member)

#endif /* LINUX_VERSION_IS_LESS(6, 10, 0) */

#if LINUX_VERSION_IS_LESS(6, 15, 0)
#include <linux/crc32c.h>
#endif /* LINUX_VERSION_IS_LESS(6, 15, 0) */
Expand All @@ -22,6 +16,36 @@

#endif /* LINUX_VERSION_IS_LESS(6, 16, 0) */

#if LINUX_VERSION_IS_LESS(6, 16, 0) || !defined(CONFIG_NET_CRC32C)

#include <linux/skbuff.h>
#include <linux/crc32.h>

static inline u32 batadv_skb_crc32c(struct sk_buff *skb, int offset,
int len, u32 crc)
{
unsigned int to = offset + len;
unsigned int consumed = 0;
struct skb_seq_state st;
unsigned int l;
const u8 *data;

if (len <= 0)
return crc;

skb_prepare_seq_read(skb, offset, to, &st);
while ((l = skb_seq_read(consumed, &data, &st)) != 0) {
crc = crc32c(crc, data, l);
consumed += l;
}

return crc;
}

#define skb_crc32c batadv_skb_crc32c

#endif /* LINUX_VERSION_IS_LESS(6, 16, 0) || !defined(CONFIG_NET_CRC32C) */

/* <DECLARE_EWMA> */

#include <linux/version.h>
Expand Down