NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/wpan-tools: bump to version 0.9

Browse Source 
- Switch site to github
- Remove patch (already in version)
- Add hash for license file

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-03-17 17:05:19 +01:00 committed by Thomas Petazzoni
parent 33f1bd1f02
commit 617749e9eb
3 changed files with 7 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch
View File

@ -1,49 +0,0 @@
From bb522bd584f05e6658d5dba97f48ca018f46394c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 6 May 2017 14:36:08 +0200
Subject: [PATCH] src/nl_extras.h: fix compatibility with libnl 3.3.0
nl_extras.h defines a set of nla_set_s*() functions if not provided by
libnl. They are provided by libnl since version 3.2.26. The test
(LIBNL_VER_MIC <= 26) was working fine while libnl was in the 3.2.x
series, but now that they have incremented the minor version, the
micro version was reset to 0, with the latest libnl version being
3.3.0.
Due to this, the condition (LIBNL_VER_MIC <= 26) is true, and we get
redefinition errors because nl_extras.h redefines functions already
provided by libnl.
This commit improves the condition so that nl_extras.h provides the
missing functions only if the minor version is < 2, or if minor is 2
and micro is < 26.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
src/nl_extras.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nl_extras.h b/src/nl_extras.h
index c4d1d14..37844f9 100644
--- a/src/nl_extras.h
+++ b/src/nl_extras.h
@@ -1,7 +1,7 @@
#ifndef __NL_EXTRAS_H
#define __NL_EXTRAS_H
-#if LIBNL_VER_MIC <= 26
+#if (LIBNL_VER_MIN < 2) || (LIBNL_VER_MIN == 2) && (LIBNL_VER_MIC <= 26)
#ifndef NLA_S8
@@ -45,6 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla)
#endif /* NLA_S64 */
-#endif /* LIBNL_VER_MIC */
+#endif /* LIBNL_VER_* */
#endif /* __NL_EXTRAS_H */
--
2.7.4

7
package/wpan-tools/wpan-tools.hash
View File

@ -1,4 +1,3 @@
# From http://wpan.cakelab.org/releases/md5sum # Locally calculated
md5 91f0b640ff66910e977fab6525625624 wpan-tools-0.7.tar.xz sha256 3e509d9ed838df1247cc9a0c6ca483cb356ae778851817bd7410044687b655e2 wpan-tools-0.9.tar.gz
# Calculated based on the hash above sha256 fe8e595c24d821a60885eb259619df5e5e3976c48465fde0be29fcd78530798f COPYING
sha256 c16de9d7861c2d9b6a4436a0fac730f9f545ee290b92bc770c538ec6a3f22309 wpan-tools-0.7.tar.xz

7
package/wpan-tools/wpan-tools.mk
View File

@ -4,11 +4,12 @@
# #
################################################################################ ################################################################################
WPAN_TOOLS_VERSION = 0.7 WPAN_TOOLS_VERSION = 0.9
WPAN_TOOLS_SOURCE = wpan-tools-$(WPAN_TOOLS_VERSION).tar.xz WPAN_TOOLS_SITE = $(call github,linux-wpan,wpan-tools,wpan-tools-$(WPAN_TOOLS_VERSION))
WPAN_TOOLS_SITE = http://wpan.cakelab.org/releases
WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl
WPAN_TOOLS_LICENSE = ISC WPAN_TOOLS_LICENSE = ISC
WPAN_TOOLS_LICENSE_FILES = COPYING WPAN_TOOLS_LICENSE_FILES = COPYING
# From git
WPAN_TOOLS_AUTORECONF = YES
$(eval $(autotools-package)) $(eval $(autotools-package))