aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong.Lu@windriver.com <Chong.Lu@windriver.com>2014-10-16 14:31:13 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2014-10-21 14:23:25 -0400
commitd6f4b66e3fdefb309002f5ffc9aa8d7de60501f3 (patch)
treecd46a888199ebddcc8d38551b2b9293c45c93237
parentfd7b22c3f503e677c801d19a7dd1074d6cb66730 (diff)
downloadmeta-openembedded-d6f4b66e3fdefb309002f5ffc9aa8d7de60501f3.tar.gz
quagga: remove watchquagga when start with systemd
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 <Chong.Lu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--meta-networking/recipes-protocols/quagga/quagga.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index 9bdd4d590a..2c0817b83f 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"