From 0aa846dec7a847c6800fcf6a22d5441983ae3120 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 24 Apr 2020 19:01:20 +0200 Subject: [PATCH 1/4] batman-adv: Drop compat-sources build The compat-sources are no longer needed for kernels >= 4.4. Older kernel versions are not used since a while in OpenWrt. Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 0b86592..4d2def3 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -73,13 +73,7 @@ NOSTDINC_FLAGS = \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ -DBATADV_SOURCE_VERSION=\\\"$(PKG_VERSION)-openwrt-$(PKG_RELEASE)\\\" -COMPAT_SOURCES = \ - $(if $(CONFIG_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \ - $(if $(CONFIG_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \ - $(if $(CONFIG_BATMAN_ADV_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \ - define Build/Compile - +env "batman-adv-y=$(COMPAT_SOURCES)" \ $(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ From 43e4da9ac5be8c474f4bb7d6d8d6c83b55ebdb8f Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 24 Apr 2020 19:23:48 +0200 Subject: [PATCH 2/4] alfred: upgrade package to latest release 2020.1 * (no changes) Signed-off-by: Sven Eckelmann --- alfred/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index e93e3d7..e4c9141 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred -PKG_VERSION:=2020.0 +PKG_VERSION:=2020.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:=1505bcb235289baaad25a5001a0189e4f16e5c4f023db62a8682c0eb91b162c0 +PKG_HASH:=e0721fb40b46c265433cbe6dfcba854e19dad1b69b62475dd01db7af503ea715 PKG_MAINTAINER:=Simon Wunderlich PKG_LICENSE:=GPL-2.0-only MIT From 6d40c7863924074fee8d421c7040c4bfecf07b4c Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 24 Apr 2020 19:24:15 +0200 Subject: [PATCH 3/4] batctl: upgrade package to latest release 2020.1 * bugs squashed: - Fix error code on throughputmeter errors Signed-off-by: Sven Eckelmann --- batctl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batctl/Makefile b/batctl/Makefile index 196813d..4c8438e 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl -PKG_VERSION:=2020.0 +PKG_VERSION:=2020.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:=60efe9b148f66aa1b29110493244dc9f1f1d722e6d96969e4d4b2c0ab9278104 +PKG_HASH:=a3e21cbac5f7103925872d80d806d8677f034f8ae8bb6bf6296af81ab028c23b PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Simon Wunderlich From d6ba424d34cff074416aa8b6a965cbcc38c86afc Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 24 Apr 2020 19:30:11 +0200 Subject: [PATCH 4/4] batman-adv: upgrade package to latest release 2020.1 * support latest kernels (3.16 - 5.7-rc2) * coding style cleanups and refactoring * bugs squashed: - fix reference leaks in throughput_override sysfs file - fix reference leak in B.A.T.M.A.N. V OGM error handling - fix network coding random weighting Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 4d2def3..2540f3f 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2020.0 +PKG_VERSION:=2020.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:=a12a32d1ec65b94b54ca86e6f31ac1b947bf04449aad0c96dfe936746bd0c585 +PKG_HASH:=23abf5576d4594c36a5b6a775f8d2bbd0025f004a8980f68358484f4a0730fbb PKG_EXTMOD_SUBDIRS:=net/batman-adv PKG_MAINTAINER:=Simon Wunderlich