Merge pull request #1080 from ecsv/batadv-2024.3

batman-adv: update packages to version 2024.3
openwrt · Oct 16, 2024 · 0ff4ab0 · 0ff4ab0
2 parents cbf0477 + 9e2c5ae
commit 0ff4ab0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 419 deletions.
diff --git a/alfred/Makefile b/alfred/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alfred
-PKG_VERSION:=2024.2
+PKG_VERSION:=2024.3
 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:=a8404c6617ee9b5a4e605b516bc694afc6596130bc802bfd30fbc7a1db3aef1f
+PKG_HASH:=d7114338c1a064695af71d58de03677a7219b07c55429b80f86dc03c0249ffea
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 PKG_LICENSE:=GPL-2.0-only MIT

diff --git a/batctl/Makefile b/batctl/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
-PKG_VERSION:=2024.2
+PKG_VERSION:=2024.3
 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:=cb02953093ffc2c700d122c03a3d9e4d867f646d3038f31d0a901e58ff995d07
+PKG_HASH:=665e655eda381415218a4d5f5fd77ff33c4fa9b5edbb7e88e839096961e3600b
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2024.2
-PKG_RELEASE:=1
+PKG_VERSION:=2024.3
+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:=7692a6dee7a2f3f66732e9aec8c7164e0c1818167f3af063bff3fffbb0199643
+PKG_HASH:=b96817ed1f4f48917c32550a84faad8c87ecf53aa6f6f46cc26554b999b57ff3
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

diff --git a/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch b/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
diff --git a/.../0002-fix-batadv_is_cfg80211_netdev.patch → .../0001-fix-batadv_is_cfg80211_netdev.patch b/.../0002-fix-batadv_is_cfg80211_netdev.patch → .../0001-fix-batadv_is_cfg80211_netdev.patch
diff --git a/...an-adv-Switch-to-linux-array_size.h.patch → ...an-adv-Switch-to-linux-array_size.h.patch b/...an-adv-Switch-to-linux-array_size.h.patch → ...an-adv-Switch-to-linux-array_size.h.patch
@@ -41,7 +41,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
  #include <linux/atomic.h>
  #include <linux/build_bug.h>
  #include <linux/byteorder/generic.h>
-@@ -19,6 +18,7 @@
+@@ -20,6 +19,7 @@
  #include <linux/init.h>
  #include <linux/ip.h>
  #include <linux/ipv6.h>