Skip to contentSkip to conversation

package/batman-adv: fix license

PATCH New Fabrice Fontaine 2 participants 6 messages Aug 15, 2019 – Sep 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 package/batman-adv: fix license

batman_adv.h is licensed under MIT

---
 package/batman-adv/batman-adv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/batman-adv/batman-adv.mk +1 -1
index 51799186d8..2cebe13562 100644
@@ -6,7 +6,7 @@
 
 BATMAN_ADV_VERSION = 2017.0.1
 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
-BATMAN_ADV_LICENSE = GPL-2.0
+BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
 
 # Bridge Loop Avoidance, Distributed Arp Table are always enabled
 BATMAN_ADV_CFLAGS = \
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/4 package/batman-adv: bump to version 2019.3

- Add license files and their hash
- Fix build with latest kernel

This bump should also close
https://bugs.buildroot.org/show_bug.cgi?id=10861

Fixes:
- No autobuilder failures

---
 package/batman-adv/batman-adv.hash | 10 +++++++---
 package/batman-adv/batman-adv.mk   |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)
package/batman-adv/batman-adv.hash +7 -3
index 0599b919be..dabbec8120 100644
@@ -1,3 +1,7 @@
-# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.0.1.tar.gz.{md5,sha1}
-md5  ce14f7f1bbc037691bbbc611e16f0360         batman-adv-2017.0.1.tar.gz
-sha1 593cecc015b876caa5b21fbb4d0f6186742a1abb batman-adv-2017.0.1.tar.gz
+# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2019.3.tar.gz.{md5,sha1}
+md5  39345688ddf12a542853b2318325f07b         batman-adv-2019.3.tar.gz
+sha1 202539c0cbf4604f6c8e9d427b338d4e807bd220 batman-adv-2019.3.tar.gz
+
+# Hash for license files
+sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0
+sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT
package/batman-adv/batman-adv.mk +3 -1
index 2cebe13562..3f48e62051 100644
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-BATMAN_ADV_VERSION = 2017.0.1
+BATMAN_ADV_VERSION = 2019.3
 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
 BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
+BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
 
 # Bridge Loop Avoidance, Distributed Arp Table are always enabled
 BATMAN_ADV_CFLAGS = \
 	-I$(@D)/compat-include/ \
+	-I$(@D)/include/ \
 	-include $(@D)/compat.h \
 	-DBATADV_SOURCE_VERSION=\"\\\"$(BATMAN_ADV_VERSION)\\\"\"
 BATMAN_ADV_MODULE_MAKE_OPTS = \
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/4 package/batctl: fix license

In reply to Fabrice Fontaine

batman_adv.h and list.h are licensed under MIT

---
 package/batctl/batctl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/batctl/batctl.mk +1 -1
index 122263e460..824d2e15f5 100644
@@ -6,7 +6,7 @@
 
 BATCTL_VERSION = 2017.0
 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION)
-BATCTL_LICENSE = GPL-2.0
+BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h)
 BATCTL_DEPENDENCIES = libnl host-pkgconf
 
 define BATCTL_BUILD_CMDS
Signature · 1 line
2.20.1
#3 lore raw

PATCH 3/4 package/batctl: fix license

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

batman_adv.h and list.h are licensed under MIT

Committed to 2019.02.x and 2019.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 4/4 package/batcl: bump to version 2019.3

In reply to Fabrice Fontaine

Add license files and their hash

---
 package/batctl/batctl.hash | 8 +++++---
 package/batctl/batctl.mk   | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)
package/batctl/batctl.hash +5 -3
index 257e1ff207..94f3de0230 100644
@@ -1,4 +1,6 @@
-# From https://downloads.open-mesh.org/batman/releases/batman-adv-2017.0/batctl-2017.0.tar.gz.sha1
-sha1 0fbc329b56b465fa4f674cfecd7348144609f8e5  batctl-2017.0.tar.gz
+# From https://downloads.open-mesh.org/batman/releases/batman-adv-2019.3/batctl-2019.3.tar.gz.sha1
+sha1 3a1357d51e9338e79e9953b7d8b33ace9f904b30  batctl-2019.3.tar.gz
 # Locally calculated
-sha256 c0bb1127d6070b46abeb8d6a63d1150d71fa85f87f9a846873b649a21934c686  batctl-2017.0.tar.gz
+sha256 2bd93fa14925a8dc63a67e64266c8ccd2fa3ac44b10253d93e6f8a630350070c  batctl-2019.3.tar.gz
+sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025  LICENSES/preferred/GPL-2.0
+sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f  LICENSES/preferred/MIT
package/batctl/batctl.mk +2 -1
index 824d2e15f5..17ed15e36d 100644
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-BATCTL_VERSION = 2017.0
+BATCTL_VERSION = 2019.3
 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION)
 BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h)
+BATCTL_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
 BATCTL_DEPENDENCIES = libnl host-pkgconf
 
 define BATCTL_BUILD_CMDS
Signature · 1 line
2.20.1