diff --git a/alfred/Makefile b/alfred/Makefile index c135508..0786b2b 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred -PKG_VERSION:=2019.3 -PKG_RELEASE:=2 -PKG_HASH:=a4c37920de497701680abb55c49cdcd11e4e7135e0e7e79259c35492a3df4766 +PKG_VERSION:=2019.4 +PKG_RELEASE:=0 +PKG_HASH:=b5525b396595004654335ac1ebf9de1aab90263e66d5bcc43fc8a708b56a18ea PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-only MIT +PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT include $(INCLUDE_DIR)/package.mk diff --git a/alfred/patches/0001-alfred-vis-Add-missing-include-for-ifinfomsg.patch b/alfred/patches/0001-alfred-vis-Add-missing-include-for-ifinfomsg.patch deleted file mode 100644 index 3a982b8..0000000 --- a/alfred/patches/0001-alfred-vis-Add-missing-include-for-ifinfomsg.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Sven Eckelmann -Date: Thu, 1 Aug 2019 15:54:32 +0200 -Subject: alfred: vis: Add missing include for ifinfomsg - -Fixes: 0fc6e6674428 ("alfred: vis: Retrieve hardif status via generic netlink") -Signed-off-by: Sven Eckelmann - -Origin: upstream, https://git.open-mesh.org/alfred.git/commit/ce26453bd72829ac9561acd8d3a06a3937341687 - -diff --git a/vis/vis.c b/vis/vis.c -index 947456343125458845f26dc38b53f18d6fd42d75..8df3056612d5da3678603a6e6430923c0c86cde0 100644 ---- a/vis/vis.c -+++ b/vis/vis.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/batctl/Makefile b/batctl/Makefile index 168b17f..6aebebb 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl -PKG_VERSION:=2019.3 +PKG_VERSION:=2019.4 PKG_RELEASE:=0 -PKG_HASH:=2bd93fa14925a8dc63a67e64266c8ccd2fa3ac44b10253d93e6f8a630350070c +PKG_HASH:=a3564eb9727335352dc0cfa2f2b29474c2c837384689ac5fcb387784a56e7685 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-only ISC MIT +PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT LICENSES/deprecated/ISC PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index dd4e9b1..c59ebce 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2019.3 +PKG_VERSION:=2019.4 PKG_RELEASE:=0 -PKG_HASH:=3454dc8bd6cb264e2decda1b99ef3f837535ed33802abc6c39551c181d3984ce +PKG_HASH:=de07be3f46dddadc3f9608ca11814ecae534c65ccd7cbfeb9762f8e90a17f660 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-only MIT +PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT PKG_EXTMOD_SUBDIRS=net/batman-adv STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h