diff options
author | Aws Ismail <aws.ismail@windriver.com> | 2013-03-25 11:30:06 -0400 |
---|---|---|
committer | Joe MacDonald <joe.macdonald@windriver.com> | 2013-03-25 13:09:34 -0400 |
commit | f64db3011c04ada0a8ac04b9eddde05b67d21eec (patch) | |
tree | 99e29962512350caed2f45af6337de50067a706b /meta-networking/recipes-protocols | |
parent | 6ad5a1b6e3d457ac599cae78d0b0d28b54d0dcff (diff) | |
download | meta-openembedded-f64db3011c04ada0a8ac04b9eddde05b67d21eec.tar.gz |
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.
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Diffstat (limited to 'meta-networking/recipes-protocols')
-rw-r--r-- | meta-networking/recipes-protocols/quagga/quagga.inc | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 6ee2455be..9a70d183f 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc | |||
@@ -9,11 +9,13 @@ HOMEPAGE = "http://www.quagga.net/" | |||
9 | SECTION = "network" | 9 | SECTION = "network" |
10 | LICENSE = "GPL-2.0 & LGPL-2.0" | 10 | LICENSE = "GPL-2.0 & LGPL-2.0" |
11 | DEPENDS = "readline ncurses perl-native" | 11 | DEPENDS = "readline ncurses perl-native" |
12 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" | ||
13 | SNMP_CONF="${@base_contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" | ||
12 | 14 | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ |
14 | file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" | 16 | file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" |
15 | 17 | ||
16 | INC_PR = "r0" | 18 | INC_PR = "r1" |
17 | 19 | ||
18 | QUAGGASUBDIR = "" | 20 | QUAGGASUBDIR = "" |
19 | # ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old | 21 | # ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old |
@@ -46,7 +48,8 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ | |||
46 | --enable-configfile-mask=0640 \ | 48 | --enable-configfile-mask=0640 \ |
47 | --enable-logfile-mask=0640 \ | 49 | --enable-logfile-mask=0640 \ |
48 | --enable-rtadv \ | 50 | --enable-rtadv \ |
49 | --enable-tcp-md5" | 51 | --enable-linux24-tcp-md5 \ |
52 | ${SNMP_CONF}" | ||
50 | 53 | ||
51 | do_install () { | 54 | do_install () { |
52 | # Install init script and default settings | 55 | # Install init script and default settings |
@@ -57,6 +60,12 @@ do_install () { | |||
57 | install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga | 60 | install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga |
58 | install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga | 61 | install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga |
59 | install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga | 62 | install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga |
63 | |||
64 | # Install sample configurations for the daemons | ||
65 | for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do | ||
66 | install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample | ||
67 | done | ||
68 | |||
60 | # Install quagga | 69 | # Install quagga |
61 | oe_runmake install DESTDIR=${D} prefix=${prefix} \ | 70 | oe_runmake install DESTDIR=${D} prefix=${prefix} \ |
62 | sbindir=${sbindir} \ | 71 | sbindir=${sbindir} \ |
@@ -106,17 +115,23 @@ INITSCRIPT_PARAMS_${PN} = "defaults 15 85" | |||
106 | INITSCRIPT_NAME_${PN}-watchquagga = "watchquagga" | 115 | INITSCRIPT_NAME_${PN}-watchquagga = "watchquagga" |
107 | INITSCRIPT_PARAMS_${PN}-watchquagga = "defaults 90 10" | 116 | INITSCRIPT_PARAMS_${PN}-watchquagga = "defaults 90 10" |
108 | 117 | ||
118 | # Add quagga's user and group | ||
109 | USERADD_PACKAGES = "${PN}" | 119 | USERADD_PACKAGES = "${PN}" |
110 | GROUPADD_PARAM_${PN} = "--system quagga ; --system quaggavty" | 120 | GROUPADD_PARAM_${PN} = "--system quagga ; --system quaggavty" |
111 | USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga quagga" | 121 | USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga quagga" |
112 | 122 | ||
113 | pkg_postinst_${PN} () { | 123 | pkg_postinst_${PN} () { |
114 | for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done | 124 | if [ "x$D" != "x" ] ; then |
125 | exit 1 | ||
126 | fi | ||
127 | for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done | ||
115 | chown quagga:quaggavty ${sysconfdir}/quagga | 128 | chown quagga:quaggavty ${sysconfdir}/quagga |
116 | chown quagga:quagga ${sysconfdir}/quagga/*.conf | 129 | chown quagga:quagga ${sysconfdir}/quagga/*.conf |
117 | chmod 750 ${sysconfdir}/quagga | 130 | chmod 750 ${sysconfdir}/quagga |
118 | chown 640 ${sysconfdir}/quagga/*.conf | 131 | chown 640 ${sysconfdir}/quagga/*.conf |
119 | ${sysconfdir}/init.d/populate-volatile.sh update | 132 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then |
133 | ${sysconfdir}/init.d/populate-volatile.sh update | ||
134 | fi | ||
120 | } | 135 | } |
121 | 136 | ||
122 | # Stop apps before uninstall | 137 | # Stop apps before uninstall |