iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
package/lldpd/0001-build-fix-compilation-with--enable-fdp--disable-cdp.patch
View File

@@ -1,36 +0,0 @@
From 4e7ec8233cd185941eaa9e41785cfc53f92799b4 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Tue, 8 Jan 2019 17:19:15 -0500
Subject: [PATCH] build: fix compilation with `--enable-fdp --disable-cdp`
Fix #315
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://github.com/vincentbernat/lldpd/commit/4e7ec8233cd185941eaa9e41785cfc53f92799b4]
---
src/lldpd-structs.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h
index c3ffa108..f6b03d7d 100644
--- a/src/lldpd-structs.h
+++ b/src/lldpd-structs.h
@@ -129,7 +129,7 @@ struct lldpd_dot3_power {
MARSHAL(lldpd_dot3_power);
#endif
-#ifdef ENABLE_CDP
+#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
struct cdpv2_power {
u_int16_t request_id;
u_int16_t management_id;
@@ -273,7 +273,7 @@ struct lldpd_port {
struct lldpd_med_power p_med_power;
#endif
-#ifdef ENABLE_CDP
+#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
struct cdpv2_power p_cdp_power;
#endif

8
package/lldpd/lldpd.hash
View File

@@ -1,3 +1,5 @@
# Locally computed
sha256 39fced395168015416bfe78b95414facf066f841f349024433aa20ab54e4c360 lldpd-1.0.3.tar.gz
sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE
# Locally computed after checking gpg key
# https://media.luffy.cx/files/lldpd/lldpd-1.0.5.tar.gz.gpg
# using key AEF2348766F371C689A7360095A42FE8353525F9
sha256 2dd3b212f4dbabfcbb2794c0010b245f9f8e74b387984e757be6243a74c6cb99 lldpd-1.0.5.tar.gz
sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE

10
package/lldpd/lldpd.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
LLDPD_VERSION = 1.0.3
LLDPD_SITE = http://media.luffy.cx/files/lldpd
LLDPD_VERSION = 1.0.5
LLDPD_SITE = https://media.luffy.cx/files/lldpd
LLDPD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_CHECK),check) \
host-pkgconf \
@@ -65,10 +65,4 @@ define LLDPD_INSTALL_INIT_SYSV
$(TARGET_DIR)/etc/init.d/S60lldpd
endef
define LLDPD_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/lldpd.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lldpd.service
endef
$(eval $(autotools-package))