Skip to contentSkip to conversation

Quagga has no snmp support, unrecognized options --enable-tcp-md5

PATCH Superseded Aws Ismail 2 participants 3 messages Mar 21, 2013 – Mar 22, 2013

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Aws Ismail

author
#0 lore raw

v2 cover Quagga has no snmp support, unrecognized options --enable-tcp-md5

*** V2 ***
Fix typo in the SNMP CONF line
*** V2 ***

This commit introduces a set of changes to do the following:

1. Update the configure option for quagga to replace the old --enable-tcp-md5
2. Add snmp support based on DISTRO_FEATURES availability.
3. Install sample runtime configuration files for quagga and its daemons.
4. Make sure the post install script is executed at the right stage.

Aws Ismail (1):
Quagga has no snmp support, unrecognized options --enable-tcp-md5

 .../recipes-protocols/quagga/quagga.inc            |   23 ++++++++++++++++---
 1 files changed, 19 insertions(+), 4 deletions(-)
author
#1 lore raw

PATCH v2 1/1 Quagga has no snmp support, unrecognized options --enable-tcp-md5

1. Quagga's tcp-md5 has been renamed to linux24-tcp-md5

2. net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp. Make the net-snmp option dependent on the DISTRO_FEATURE snmp.

3. Misc: install the sample conf files for quagga. Also, Make sure that the post install script is being run on the target rather than during the rootfs creation stage.

---
 .../recipes-protocols/quagga/quagga.inc            |   23 ++++++++++++++++---
 1 files changed, 19 insertions(+), 4 deletions(-)
meta-networking/recipes-protocols/quagga/quagga.inc +19 -4
index 6ee2455..9a70d18 100644
@@ -9,11 +9,13 @@ HOMEPAGE = "http://www.quagga.net/"
 SECTION = "network"
 LICENSE = "GPL-2.0 & LGPL-2.0"
 DEPENDS = "readline ncurses perl-native"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}"
+SNMP_CONF="${@base_contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 QUAGGASUBDIR = ""
 # ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old
@@ -46,7 +48,8 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \
                 --enable-configfile-mask=0640 \
                 --enable-logfile-mask=0640 \
                 --enable-rtadv \
-                --enable-tcp-md5"
+                --enable-linux24-tcp-md5 \
+                ${SNMP_CONF}"
 
 do_install () {
         # Install init script and default settings
@@ -57,6 +60,12 @@ do_install () {
         install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
         install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
         install -m 0644 ${WORKDIR}/volatiles.03_quagga  ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
+
+        # Install sample configurations for the daemons
+        for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do
+            install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample
+        done
+
         # Install quagga
         oe_runmake install DESTDIR=${D} prefix=${prefix} \
                 sbindir=${sbindir} \
@@ -106,17 +115,23 @@ INITSCRIPT_PARAMS_${PN}                 = "defaults 15 85"
 INITSCRIPT_NAME_${PN}-watchquagga       = "watchquagga"
 INITSCRIPT_PARAMS_${PN}-watchquagga     = "defaults 90 10"
 
+# Add quagga's user and group
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "--system quagga ; --system quaggavty"
 USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga quagga"
 
 pkg_postinst_${PN} () {
-	for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done
+    if [ "x$D" != "x" ] ; then
+        exit 1
+    fi
+    for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done
 	chown quagga:quaggavty ${sysconfdir}/quagga
 	chown quagga:quagga ${sysconfdir}/quagga/*.conf
 	chmod 750 ${sysconfdir}/quagga
 	chown 640 ${sysconfdir}/quagga/*.conf
-	${sysconfdir}/init.d/populate-volatile.sh update
+    if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
+        ${sysconfdir}/init.d/populate-volatile.sh update
+    fi
 }
 
 # Stop apps before uninstall
Signature · 1 line
1.7.0.4
#2 lore raw
In reply to Aws Ismail
Quoted 12 lines · [[meta-networking][PATCH 0/1][V2] Quagga has no snmp support, unrecognized…

*** V2 ***
Fix typo in the SNMP CONF line
*** V2 ***

This commit introduces a set of changes to do the following:

1. Update the configure option for quagga to replace the old --enable-tcp-md5
2. Add snmp support based on DISTRO_FEATURES availability.
3. Install sample runtime configuration files for quagga and its daemons.
4. Make sure the post install script is executed at the right stage.

Quoted 5 lines

Aws Ismail (1):
Quagga has no snmp support, unrecognized options --enable-tcp-md5

 .../recipes-protocols/quagga/quagga.inc            |   23 ++++++++++++++++---
 1 files changed, 19 insertions(+), 4 deletions(-)

Hey Aws,

I hate to send this back for a v3 just for this, but since you're right there fixing stuff, can you also clean up the inconsistent use of hard tabs and spaces in the recipe? Probably best to do that as a separate commit, so it's clear what you're actually changing and what's purely cosmetic.

Signature · 2 lines
-Joe MacDonald.
:wq