openwrt-mirror/routing
1
0
Fork 0
mirror of https://github.com/openwrt/routing.git synced 2026-04-12 14:04:00 +04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1168 from ecsv/batadv-2026.1

Browse Source 
batman-adv: update packages to version 2026.1
This commit is contained in:
Simon Wunderlich
2026-04-09 19:10:48 +02:00
committed by GitHub
parent 4ec8a663e0 61466d6639
commit 57d2866271
4 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alfred/Makefile
View File

@@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=alfred
PKG_VERSION:=2026.0
PKG_VERSION:=2026.1
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:=df91152fe31fb6377a24ce93130445973510469af9377e4cc9c5f5d25e38e751
PKG_HASH:=45dfbcb8a7cbbaaee3e12607a46601dd86ce5225072535e9b49da40bbf02b489
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
PKG_LICENSE:=GPL-2.0-only MIT

4
batctl/Makefile
View File

@@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=batctl
PKG_VERSION:=2026.0
PKG_VERSION:=2026.1
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:=b4b70dae620106e45ee3ddb1f512f69075692b12343d0521267403cb212a4a26
PKG_HASH:=84441686c1d44ed57a560f2a0be9f86eb92c310f22aaa4a00933eb6c8936087a
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

31
batman-adv/Makefile
View File

@@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv
PKG_VERSION:=2026.0
PKG_VERSION:=2026.1
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:=9461d613c4f83a0a233a9f7006ad6d15e779d789c49bd35e3cc08d7e2886fcaa
PKG_HASH:=6487dd3b4ad0f85510dedbba335fe77b1b877d0e77393c51ddca07a7451b8f45
PKG_EXTMOD_SUBDIRS:=net/batman-adv
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
@@ -56,7 +56,7 @@ define Package/kmod-batman-adv/conffiles
/etc/config/batman-adv
endef
PKG_EXTRA_KCONFIG:= \
PKG_MAKE_FLAGS:= \
CONFIG_BATMAN_ADV=m \
CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_BATMAN_ADV_DEBUG),y,n) \
CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_BATMAN_ADV_BLA),y,n) \
@@ -65,29 +65,26 @@ PKG_EXTRA_KCONFIG:= \
CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_BATMAN_V),y,n) \
CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_TRACING),y,n) \
PKG_EXTRA_CFLAGS:= \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
NOSTDINC_FLAGS = \
NOSTDINC_FLAGS := \
$(KERNEL_NOSTDINC_FLAGS) \
-I$(PKG_BUILD_DIR)/net/batman-adv \
-I$(STAGING_DIR)/usr/include/mac80211-backport \
-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
-I$(STAGING_DIR)/usr/include/mac80211 \
-I$(STAGING_DIR)/usr/include/mac80211/uapi \
-I$(PKG_BUILD_DIR)/include/ \
-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
-I$(STAGING_DIR)/usr/include/mac80211-backport \
-I$(STAGING_DIR)/usr/include/mac80211/uapi \
-I$(STAGING_DIR)/usr/include/mac80211 \
-include backport/autoconf.h \
-include backport/backport.h \
-include $(PKG_BUILD_DIR)/compat-hacks.h \
-DBATADV_SOURCE_VERSION=\\\"$(PKG_VERSION)-openwrt-$(PKG_RELEASE)\\\"
NOSTDINC_FLAGS += \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_MAKE_FLAGS)))) \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_MAKE_FLAGS)))) \
define Build/Compile
$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \
+$(KERNEL_MAKE) $(PKG_JOBS) \
$(PKG_MAKE_FLAGS) \
M="$(PKG_BUILD_DIR)/net/batman-adv" \
$(PKG_EXTRA_KCONFIG) \
EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
modules
endef

13
batman-adv/src/compat-hacks.h
View File

@@ -46,6 +46,19 @@ static inline u32 batadv_skb_crc32c(struct sk_buff *skb, int offset,
#endif /* LINUX_VERSION_IS_LESS(6, 16, 0) || !defined(CONFIG_NET_CRC32C) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
#define kzalloc_obj(P, GFP) \
kzalloc(sizeof(P), GFP)
#define kmalloc_obj(P, GFP) \
kmalloc(sizeof(P), GFP)
#define kmalloc_objs(P, COUNT, GFP) \
kmalloc_array((COUNT), sizeof(P), GFP)
#endif /* < KERNEL_VERSION(7, 0, 0) */
/* <DECLARE_EWMA> */
#include <linux/version.h>