Skip to content

Commit 6d376d6

Browse files
Merge pull request #1071 from ecsv/batadv-2024.2
batman-adv: update packages to version 2024.2
2 parents 8d8cfe8 + 7e94199 commit 6d376d6

5 files changed

+9
-9
lines changed

alfred/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
include $(TOPDIR)/rules.mk
44

55
PKG_NAME:=alfred
6-
PKG_VERSION:=2024.1
6+
PKG_VERSION:=2024.2
77
PKG_RELEASE:=1
88

99
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1010
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
11-
PKG_HASH:=262dad39c9be122ac7f061705c8a3e3b6d462782bbe3372e6dfc9ace0c384db9
11+
PKG_HASH:=a8404c6617ee9b5a4e605b516bc694afc6596130bc802bfd30fbc7a1db3aef1f
1212

1313
PKG_MAINTAINER:=Simon Wunderlich <[email protected]>
1414
PKG_LICENSE:=GPL-2.0-only MIT

batctl/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
include $(TOPDIR)/rules.mk
44

55
PKG_NAME:=batctl
6-
PKG_VERSION:=2024.1
6+
PKG_VERSION:=2024.2
77
PKG_RELEASE:=1
88

99
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1010
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
11-
PKG_HASH:=683dda9d6054eb260a1ac0022c642798ff4048d6c53a672ea0b3178e6b757a09
11+
PKG_HASH:=cb02953093ffc2c700d122c03a3d9e4d867f646d3038f31d0a901e58ff995d07
1212
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
1313

1414
PKG_MAINTAINER:=Simon Wunderlich <[email protected]>

batman-adv/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
include $(TOPDIR)/rules.mk
44

55
PKG_NAME:=batman-adv
6-
PKG_VERSION:=2024.1
6+
PKG_VERSION:=2024.2
77
PKG_RELEASE:=1
88

99
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1010
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
11-
PKG_HASH:=a714329c6251f4830e9cf03f53cbfb2280f0678471b54c5d46fae61a782d4325
11+
PKG_HASH:=7692a6dee7a2f3f66732e9aec8c7164e0c1818167f3af063bff3fffbb0199643
1212
PKG_EXTMOD_SUBDIRS:=net/batman-adv
1313

1414
PKG_MAINTAINER:=Simon Wunderlich <[email protected]>

batman-adv/patches/0003-Revert-batman-adv-Switch-to-linux-sprintf.h.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ This reverts commit f0fb49c5ab70dfa064f0aa8d1c5d84f65e8cbc86.
6969
#include <net/sock.h>
7070
--- a/net/batman-adv/main.c
7171
+++ b/net/batman-adv/main.c
72-
@@ -32,7 +32,6 @@
72+
@@ -31,7 +31,6 @@
7373
#include <linux/skbuff.h>
7474
#include <linux/slab.h>
7575
#include <linux/spinlock.h>

batman-adv/patches/0004-Revert-batman-adv-Switch-to-linux-array_size.h.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
4141
#include <linux/atomic.h>
4242
#include <linux/build_bug.h>
4343
#include <linux/byteorder/generic.h>
44-
@@ -20,6 +19,7 @@
44+
@@ -19,6 +18,7 @@
4545
#include <linux/init.h>
4646
#include <linux/ip.h>
4747
#include <linux/ipv6.h>
@@ -59,7 +59,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
5959
#include <linux/atomic.h>
6060
#include <linux/bitops.h>
6161
#include <linux/bug.h>
62-
@@ -20,6 +19,7 @@
62+
@@ -19,6 +18,7 @@
6363
#include <linux/if_ether.h>
6464
#include <linux/if_vlan.h>
6565
#include <linux/init.h>

0 commit comments

Comments
 (0)