Skip to contentSkip to conversation

lldpd: Add recipe

PATCH Superseded Fabio Berton 3 participants 4 messages Sep 15, 2015 – Sep 16, 2015

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lldpd: Add recipe

From: Fabio Berton <[email protected]>

lldpd is a 802.1AB implementation, a L2 network discovery protocol. It also supports CDP, EDP and various other protocols.

---
 .../recipes-connectivity/lldpd/files/lldpd.default |   2 +
 .../recipes-connectivity/lldpd/files/lldpd.init.d  | 130 +++++++++++++++++++++
 .../recipes-connectivity/lldpd/lldpd_0.7.15.bb     |  65 +++++++++++
 3 files changed, 197 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/lldpd/files/lldpd.default
 create mode 100644 meta-networking/recipes-connectivity/lldpd/files/lldpd.init.d
 create mode 100644 meta-networking/recipes-connectivity/lldpd/lldpd_0.7.15.bb
meta-networking/recipes-connectivity/lldpd/files/lldpd.default new file +2 -0
new file mode 100644
index 0000000..3acacfd
@@ -0,0 +1,2 @@
+# Uncomment to start SNMP subagent and enable CDP, SONMP and EDP protocol
+#DAEMON_ARGS="-x -c -s -e"
meta-networking/recipes-connectivity/lldpd/files/lldpd.init.d new file +130 -0

130 lines not on this page · raw message

meta-networking/recipes-connectivity/lldpd/lldpd_0.7.15.bb new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
2.1.4
#1 lore raw

Hi Fabio,

Quoted 4 lines · [[oe] [meta-networking][PATCH] lldpd: Add recipe] On 15.09.15 (Tue 14:54)…

From: Fabio Berton <[email protected]>

lldpd is a 802.1AB implementation, a L2 network discovery protocol. It also supports CDP, EDP and various other protocols.

I haven't looked at this in great detail yet, but it appears like it would provide the same functionality as lldpad, already in meta-networking:

commit 6781f9b5dc60bbd39727aeaa74c13dd31eb73838

Author: Qian Lei <[email protected]>
Date:   Thu Dec 11 17:36:20 2014 +0800

lldpad: Add new recipe

LLDPAD contains the Linux user space daemon and configuration tool for Intel LLDP Agent with Enhanced Ethernet support for the Data Center.

I've no objection to carrying two different implementations, particularly if one is more complete than the other or if one is more actively developed, but I do have a couple of requests for you given that you're the second one on the scene.

- Can we move your recipe to sit beside the other lldp daemon? (That is, in recipes-daemons)

- Can you update your recipe (and the other, if necessary) to provide an appropriate PROVIDES / CONFLICTS variable?

-J.

Quoted 229 lines
---
 .../recipes-connectivity/lldpd/files/lldpd.default |   2 +
 .../recipes-connectivity/lldpd/files/lldpd.init.d  | 130 +++++++++++++++++++++
 .../recipes-connectivity/lldpd/lldpd_0.7.15.bb     |  65 +++++++++++
 3 files changed, 197 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/lldpd/files/lldpd.default
 create mode 100644 meta-networking/recipes-connectivity/lldpd/files/lldpd.init.d
 create mode 100644 meta-networking/recipes-connectivity/lldpd/lldpd_0.7.15.bb
meta-networking/recipes-connectivity/lldpd/files/lldpd.default new file +2 -0
new file mode 100644
index 0000000..3acacfd
@@ -0,0 +1,2 @@
+# Uncomment to start SNMP subagent and enable CDP, SONMP and EDP protocol
+#DAEMON_ARGS="-x -c -s -e"
meta-networking/recipes-connectivity/lldpd/files/lldpd.init.d new file +130 -0
new file mode 100644
index 0000000..2d88d25
@@ -0,0 +1,130 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          lldpd
+# Required-Start:    $remote_fs $network $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: LLDP daemon
+# Description:       lldpd is a 802.1AB implementation, a L2 network
+#                    discovery protocol. It also supports CDP, EDP and
+#                    various other protocols.
+### END INIT INFO
+
+# Do NOT "set -e"
+
+log_daemon_msg() {
+    echo $*
+}
+
+log_end_msg() {
+    if [ $1 -eq 0 ]; then
+        success $*
+    else
+        failure $*
+    fi
+}
+
+log_failure_msg() {
+    echo $*
+}
+
+log_success_msg() {
+    echo $*
+}
+
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="LLDP daemon"
+NAME=lldpd
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS=""
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+CHROOT=/var/run/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# LSB log_* functions
+. /etc/init.d/functions
+
+do_start()
+{
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+do_reload() {
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  reload)
+	log_daemon_msg "Reloading $DESC" "$NAME"
+	do_reload
+	log_end_msg $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  status)
+	status_of_proc $DAEMON $NAME -p $PIDFILE && exit 0 || exit $?
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2
+	exit 3
+	;;
+esac
+
+:
meta-networking/recipes-connectivity/lldpd/lldpd_0.7.15.bb new file +65 -0
new file mode 100644
index 0000000..f68dae3
@@ -0,0 +1,65 @@
+SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"
+SECTION = "net/misc"
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
+
+DEPENDS = "libbsd libevent"
+
+SRC_URI = "\
+    http://media.luffy.cx/files/${PN}/${PN}-${PV}.tar.gz \
+    file://lldpd.init.d \
+    file://lldpd.default \
+"
+
+SRC_URI[md5sum] = "46f7ad97fc1d04084ab11b32fc0ed708"
+SRC_URI[sha256sum] = "c891d6d4480a6a890561ac43d8cc923bd027deb82a3999d65f37d96ca368c246"
+
+inherit autotools update-rc.d useradd systemd pkgconfig
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd"
+GROUPADD_PARAM_${PN} = "--system lldpd"
+
+EXTRA_OECONF += "--without-embedded-libevent \
+                 --disable-oldies \
+                 --with-privsep-user=lldpd \
+                 --with-privsep-group=lldpd"
+
+PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3"
+PACKAGECONFIG[json] = "--with-json,--without-json,jansson"
+PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2"
+PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp"
+PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
+PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp"
+PACKAGECONFIG[cdp] = "--enable-cdp,--disable-cdp"
+PACKAGECONFIG[fdp] = "--enable-fdp,--disable-fdp"
+PACKAGECONFIG[edp] = "--enable-edp,--disable-edp"
+PACKAGECONFIG[sonmp] = "--enable-sonmp,--disable-sonmp"
+PACKAGECONFIG[lldpmed] = "--enable-lldpmed,--disable-lldpmed"
+PACKAGECONFIG[dot1] = "--enable-dot1,--disable-dot1"
+PACKAGECONFIG[dot3] = "--enable-dot3,--disable-dot3"
+PACKAGECONFIG[custom] = "--enable-custom,--disable-custom"
+
+INITSCRIPT_NAME = "lldpd"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "lldpd.service"
+
+do_install_append() {
+    install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd
+    install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd
+    # Make an empty configuration file
+    touch ${D}${sysconfdir}/lldpd.conf
+}
+
+PACKAGES =+ "${PN}-bash-completion ${PN}-zsh-completion"
+
+FILES_${PN} += "${datadir}/zsh ${libdir}/sysusers.d"
+RDEPENDS_${PN} += "os-release"
+
+FILES_${PN}-bash-completion += "${sysconfdir}/bash_completion.d/"
+RDEPENDS_${PN}-bash-completion += "bash"
+
+FILES_${PN}-zsh-completion += "${datadir}/zsh/vendor-completions/"
+# FIXME: zsh is broken in meta-oe so this cannot be enabled for now
+#RDEPENDS_${PN}-zsh-completion += "zsh"
Signature · 1 line
2.1.4
Signature · 2 lines
-Joe MacDonald.
:wq
#2 lore raw

Hello Joe,

Quoted 20 lines · Joe MacDonald
Quoted 4 lines · [[oe] [meta-networking][PATCH] lldpd: Add recipe] On 15.09.15 (Tue 14:54)…

From: Fabio Berton <[email protected]>

lldpd is a 802.1AB implementation, a L2 network discovery protocol. It also supports CDP, EDP and various other protocols.

I haven't looked at this in great detail yet, but it appears like it would provide the same functionality as lldpad, already in meta-networking:

commit 6781f9b5dc60bbd39727aeaa74c13dd31eb73838

Author: Qian Lei <[email protected]>
Date:   Thu Dec 11 17:36:20 2014 +0800

lldpad: Add new recipe

LLDPAD contains the Linux user space daemon and configuration tool for Intel LLDP Agent with Enhanced Ethernet support for the Data Center.

Quoted 7 lines

I've no objection to carrying two different implementations, particularly if one is more complete than the other or if one is more actively developed, but I do have a couple of requests for you given that you're the second one on the scene.

It seems the lldpd is way more actively maintained. We have a customer using this in an environment with some thousands of network devices with great success and we wished to upstream the recipe and avoid maintaining a closed recipe for no reason.

Quoted 2 lines

- Can we move your recipe to sit beside the other lldp daemon? (That is, in recipes-daemons)

I think it does make sense. Fabio, can you please do so?

Quoted 2 lines

- Can you update your recipe (and the other, if necessary) to provide an appropriate PROVIDES / CONFLICTS variable?

I am not sure we should. Being two alternatives nothing blocks someone to install both.

To be honest, maybe this one could replace the old one for meta-network future users, if Qian Lei agrees.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#3 lore raw

Hi Otavio,

I see there's a new version to look at but this is the thread where the discussion is happening that I want to continue, so here we go. :-)

Quoted 31 lines · [Re: [oe] [meta-networking][PATCH] lldpd: Add recipe] On 15.09.15 (Tue 17:33)…

Hello Joe,

Quoted 20 lines · Joe MacDonald
Quoted 4 lines · [[oe] [meta-networking][PATCH] lldpd: Add recipe] On 15.09.15 (Tue 14:54)…

From: Fabio Berton <[email protected]>

lldpd is a 802.1AB implementation, a L2 network discovery protocol. It also supports CDP, EDP and various other protocols.

I haven't looked at this in great detail yet, but it appears like it would provide the same functionality as lldpad, already in meta-networking:

commit 6781f9b5dc60bbd39727aeaa74c13dd31eb73838

Author: Qian Lei <[email protected]>
Date:   Thu Dec 11 17:36:20 2014 +0800

lldpad: Add new recipe

LLDPAD contains the Linux user space daemon and configuration tool for Intel LLDP Agent with Enhanced Ethernet support for the Data Center.

Quoted 7 lines

I've no objection to carrying two different implementations, particularly if one is more complete than the other or if one is more actively developed, but I do have a couple of requests for you given that you're the second one on the scene.

Quoted 4 lines

It seems the lldpd is way more actively maintained. We have a customer using this in an environment with some thousands of network devices with great success and we wished to upstream the recipe and avoid maintaining a closed recipe for no reason.

I'm good with that. Coming from a carrier background I know that frequent updates does not necessarily mean more stable, but actively developed with real-world users is convincing enough for me to merge this.

Quoted 5 lines
Quoted 2 lines

- Can you update your recipe (and the other, if necessary) to provide an appropriate PROVIDES / CONFLICTS variable?

I am not sure we should. Being two alternatives nothing blocks someone to install both.

I thought about that, but the question in my mind is does it make sense to install both? If they both tried to start up at boot via initscripts/systemd, would they conflict with each other or do they manage that gracefully? I really don't know.

Quoted 2 lines

To be honest, maybe this one could replace the old one for meta-network future users, if Qian Lei agrees.

I'd really like that, if it turns out lldpad is a reasonable subset of lldpd functionality.

Either way I'll take a look at the latest patch set and if there's anything specific in there I have to comment on, I will, otherwise we'll give everyone else on the list a bit of time to respond and then make a call about the specifics of merging this.

Signature · 2 lines
-Joe MacDonald.
:wq