From 7df48b8014c32dbfada34163c7856db2abea5e9a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 1 Sep 2020 14:29:21 -0700 Subject: quagga,pimd: Use update-alternatives for pimd pimd is provided by both quagga and pimd, prefer quagga over pimd when both are in image Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta-networking/recipes-protocols') diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 70c32b7a4e..11b7d576a0 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -40,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" -inherit autotools update-rc.d useradd systemd pkgconfig multilib_header +inherit autotools update-rc.d useradd systemd pkgconfig multilib_header update-alternatives CFLAGS += "-fcommon" @@ -237,3 +237,7 @@ pkg_prerm_${PN}-ripngd () { pkg_prerm_${PN}-isisd () { ${sysconfdir}/init.d/quagga stop isisd } + +ALTERNATIVE_${PN} = "pimd" +ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd" + -- cgit 1.2.3-korg