package/open-lldp: bump to version 1.1
PATCH 1/1 package/open-lldp: bump to version 1.1
- Drop first patch (not needed since
https://github.com/intel/openlldp/commit/7ae79b0dff53a23fa0a964f77b9e3bb387a293c4)
- Drop second patch (not needed since
https://github.com/intel/openlldp/commit/dc35fb92dade6ac88a0b96c3395fd77eb94eaf58)
- Drop other patches (already in version)
- systemd is an optional dependency since
https://github.com/intel/openlldp/commit/5a0add7b097e0b35b96a477d56c3bb076c475b03
https://github.com/intel/openlldp/releases/tag/v1.1
--- ...tions-work-with-both-gnu11-and-gnu89.patch | 52 -- .../0002-Makefile.am-disable-Werror.patch | 38 -- .../0003-fixed-unknown-type-pid_t.patch | 42 -- ...004-lldp_head-rename-and-make-extern.patch | 500 ------------------ ...05-lldp-add-packed-struct-definition.patch | 49 -- .../open-lldp/0006-lldptool-make-extern.patch | 41 -- ...ake-enum-a-type-rather-than-instance.patch | 33 -- ...08-lldp_8021qaz-extern-config-object.patch | 29 - package/open-lldp/open-lldp.hash | 2 +- package/open-lldp/open-lldp.mk | 11 +- 10 files changed, 9 insertions(+), 788 deletions(-) delete mode 100644 package/open-lldp/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch delete mode 100644 package/open-lldp/0002-Makefile.am-disable-Werror.patch delete mode 100644 package/open-lldp/0003-fixed-unknown-type-pid_t.patch delete mode 100644 package/open-lldp/0004-lldp_head-rename-and-make-extern.patch delete mode 100644 package/open-lldp/0005-lldp-add-packed-struct-definition.patch delete mode 100644 package/open-lldp/0006-lldptool-make-extern.patch delete mode 100644 package/open-lldp/0007-ecp22-make-enum-a-type-rather-than-instance.patch delete mode 100644 package/open-lldp/0008-lldp_8021qaz-extern-config-object.patch
package/open-lldp/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch deleted +0 -52
@@ -1,52 +0,0 @@ -From e186ca9ebda181f62504a1922559ef3ddae5e3b6 Mon Sep 17 00:00:00 2001 -From: Laurent Charpentier <[email protected]> -Date: Mon, 15 Jan 2018 11:24:45 +0100 -Subject: [PATCH] get inline functions work with both gnu11 and gnu89 - -After gcc upgraded to gcc5, and if the codes are compiled without optimization(-O0), and the below error will happen: - -./include/lldp_8021qaz.h:237:12: error: inline function 'ieee8021qaz_clif_cmd' declared but never defined [-Werror] - inline int ieee8021qaz_clif_cmd(void *data, struct sockaddr_un *from, - ^ -./include/lldp_8021qaz.h:222:13: error: inline function 'set_prio_map' declared but never defined [-Werror] - inline void set_prio_map(u32 *prio_map, u8 prio, int tc); - ^ -./include/lldp_8021qaz.h:221:12: error: inline function 'get_prio_map' declared but never defined [-Werror] - inline int get_prio_map(u32 prio_map, int tc); - -gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that exactly one C source file has the callable copy of the inline function. - -Signed-off-by: Laurent Charpentier <[email protected]> -[Fabrice: patch updated so it applies after -https://github.com/intel/openlldp/commit/7ad7a2f2adc70d8e9213f8bf511bf3374d64b034] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - include/lldp_8021qaz.h | 6 ------ - lldp_8021qaz.c | 4 ++-- - 2 files changed, 2 insertions(+), 8 deletions(-) - -diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c -index 094676d..f154317 100644 ---- a/lldp_8021qaz.c -+++ b/lldp_8021qaz.c -@@ -396,7 +396,7 @@ static int read_cfg_file(char *ifname, struct lldp_agent *agent, - return 0; - } - --inline int get_prio_map(u32 prio_map, int prio) -+static inline int get_prio_map(u32 prio_map, int prio) - { - if (prio > 7) - return 0; -@@ -404,7 +404,7 @@ inline int get_prio_map(u32 prio_map, int prio) - return (prio_map >> (4 * (7-prio))) & 0xF; - } - --inline void set_prio_map(u32 *prio_map, u8 prio, int tc) -+static inline void set_prio_map(u32 *prio_map, u8 prio, int tc) - { - u32 mask = ~(0xffffffff & (0xF << (4 * (7-prio)))); - *prio_map &= mask; --- -2.14.3 -
package/open-lldp/0002-Makefile.am-disable-Werror.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From c350f263136801fd54d42322a07a3b5ad2181dd9 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Thu, 18 Jan 2018 09:29:32 +0100 -Subject: [PATCH] Makefile.am: disable -Werror - -Due to additional warnings in recent gcc versions and the use of --Werror the build fails for reasons that are not that important. For -example: - -clif.c:54:2: error: implicit declaration of function 'memset' [-Werror=implicit-function-declaration] - memset(clif, 0, sizeof(*clif)); - -or: - -log.c:46:30: error: format '%ld' expects argument of type 'long int', but argument 5 has type '__suseconds_t {aka int}' [-Werror=format=] - printf("%02d:%02d:%02d.%06ld ", - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 551d4c7..62a52a5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I m4 - parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error - - ## system requires a shared libconfig --AM_CFLAGS = -Wall -Werror -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS) -+AM_CFLAGS = -Wall -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS) - AM_LDFLAGS = $(LIBCONFIG_LIBS) $(LIBNL_LIBS) -lrt - - ## header files to be installed, for programs using the client interface to lldpad --- -2.14.3 -
package/open-lldp/0003-fixed-unknown-type-pid_t.patch deleted +0 -42
42 lines not on this page · raw message
package/open-lldp/0004-lldp_head-rename-and-make-extern.patch deleted +0 -500
500 lines not on this page · raw message
package/open-lldp/0005-lldp-add-packed-struct-definition.patch deleted +0 -49
49 lines not on this page · raw message
package/open-lldp/0006-lldptool-make-extern.patch deleted +0 -41
41 lines not on this page · raw message
package/open-lldp/0007-ecp22-make-enum-a-type-rather-than-instance.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 2723219c08726efa08a6bad04ffb775f850a96bc Mon Sep 17 00:00:00 2001 -From: Aaron Conole <[email protected]> -Date: Mon, 3 Aug 2020 15:23:28 -0400 -Subject: [PATCH] ecp22: make enum a type rather than instance - -The enum defined in the qbg header is setup as a discreet instance -rather than a type. Fix this. - -Signed-off-by: Aaron Conole <[email protected]> -[Retrieved from: -https://github.com/intel/openlldp/pull/55/commits/2723219c08726efa08a6bad04ffb775f850a96bc] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - include/qbg_ecp22.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/qbg_ecp22.h b/include/qbg_ecp22.h -index 567f6df..fe66bb3 100644 ---- a/include/qbg_ecp22.h -+++ b/include/qbg_ecp22.h -@@ -49,10 +49,10 @@ enum { /* ECP Transmit states */ - ECP22_TX_ERROR - }; - --enum { -+enum ecp22_mode { - ECP22_REQUEST = 0, - ECP22_ACK --} ecp22_mode; -+}; - - struct ecp22_hdr { /* ECP22 header */ - u16 ver_op_sub; /* ECP22 version, operation, subtype */
package/open-lldp/0008-lldp_8021qaz-extern-config-object.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 275fe9da663193a843de450f03e810daedc06955 Mon Sep 17 00:00:00 2001 -From: Aaron Conole <[email protected]> -Date: Mon, 3 Aug 2020 15:25:38 -0400 -Subject: [PATCH] lldp_8021qaz: extern config object - -The config object only exists as part of the config translation unit -so remove the extra config object in the 8021qaz module. - -Signed-off-by: Aaron Conole <[email protected]> -[Retrieved from: -https://github.com/intel/openlldp/pull/55/commits/275fe9da663193a843de450f03e810daedc06955] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - lldp_8021qaz.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c -index a42fd11..673d758 100644 ---- a/lldp_8021qaz.c -+++ b/lldp_8021qaz.c -@@ -49,7 +49,7 @@ - - - struct lldp_head lldp_head; --struct config_t lldpad_cfg; -+extern config_t lldpad_cfg; - extern bool read_only_8021qaz; - - static int ieee8021qaz_check_pending(struct port *port, struct lldp_agent *);
package/open-lldp/open-lldp.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 112c26241b3fc01496ce4affda4c870122c5343b0505f0a044445ee8056a2106 open-lldp-b71bfb87fefb31c4b1a6a7ae351791c90966c3a8.tar.gz +sha256 13e0890527192a6289e6dac82056c447a1e2624ff93b0b6bbd8a42d15b2cbc8c open-lldp-1.1.tar.gz sha256 67af5abeb092213cd9c53781503320f635ba28b641e0c3f24d367e8e93a9839b COPYING
package/open-lldp/open-lldp.mk +8 -3
@@ -4,13 +4,18 @@ # ################################################################################ -OPEN_LLDP_VERSION = b71bfb87fefb31c4b1a6a7ae351791c90966c3a8 -OPEN_LLDP_SITE = $(call github,intel,openlldp,$(OPEN_LLDP_VERSION)) +OPEN_LLDP_VERSION = 1.1 +OPEN_LLDP_SITE = $(call github,intel,openlldp,v$(OPEN_LLDP_VERSION)) OPEN_LLDP_DEPENDENCIES = readline libnl libconfig host-pkgconf OPEN_LLDP_LICENSE = GPL-2.0 OPEN_LLDP_LICENSE_FILES = COPYING -# Fetching from git, need to generate configure/Makefile.in +# Fetching from git OPEN_LLDP_AUTORECONF = YES +ifeq ($(BR2_INIT_SYSTEMD),y) +OPEN_LLDP_DEPENDENCIES += systemd +OPEN_LLDP_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +endif + $(eval $(autotools-package))
Signature · 1 line
2.28.0
PATCH 1/1 package/open-lldp: bump to version 1.1
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Drop first patch (not needed since
https://github.com/intel/openlldp/commit/7ae79b0dff53a23fa0a964f77b9e3bb387a293c4)
- Drop second patch (not needed since
https://github.com/intel/openlldp/commit/dc35fb92dade6ac88a0b96c3395fd77eb94eaf58)
- Drop other patches (already in version)
- systemd is an optional dependency since
https://github.com/intel/openlldp/commit/5a0add7b097e0b35b96a477d56c3bb076c475b03
Quoted 3 lines
https://github.com/intel/openlldp/releases/tag/v1.1
Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard