Merged, thanks. -J. [[oe] [meta-networking][PATCH] quagga: remove watchquagga when start with systemd] On 14.10.16 (Thu 14:31) Chong Lu wrote:
> When we start with sysvinit, watchquagga uses quagga init script to > monitor zebra daemon. But we need not do this in systemd environment. > > Signed-off-by: Chong Lu <[email protected]> > --- > .../recipes-protocols/quagga/quagga.inc | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc > b/meta-networking/recipes-protocols/quagga/quagga.inc > index 9bdd4d5..2c0817b 100644 > --- a/meta-networking/recipes-protocols/quagga/quagga.inc > +++ b/meta-networking/recipes-protocols/quagga/quagga.inc > @@ -62,7 +62,7 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ > --enable-exampledir=${docdir}/quagga/examples/ \ > --enable-vtysh \ > --enable-isisd \ > - --enable-watchquagga \ > + ${@base_contains('DISTRO_FEATURES', 'sysvinit', > '--enable-watchquagga', '--disable-watchquagga', d)} \ > --enable-ospf-te \ > --enable-opaque-lsa \ > --enable-ipv6 \ > @@ -135,6 +135,7 @@ do_install () { > # Remove sysinit script if sysvinit is not in DISTRO_FEATURES > if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', > d)}; then > rm -rf ${D}${sysconfdir}/init.d/ > + rm -f ${D}${sysconfdir}/default/watchquagga > fi > > install -d ${D}${systemd_unitdir}/system > @@ -160,7 +161,7 @@ pkg_postinst_${PN} () { > # Split into a main package and separate per-protocol packages > PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-babeld ${PN}-bgpd \ > ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ > - ${PN}-ospfclient ${PN}-watchquagga" > + ${PN}-ospfclient ${@base_contains('DISTRO_FEATURES', > 'sysvinit', '${PN}-watchquagga', '', d)}" > > RDEPENDS_${PN} += "${PN}-babeld ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d > ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" > > -- > 1.7.9.5 > -- -Joe MacDonald. :wq
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
