mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-13 17:39:57 +00:00
Code Issues Projects Releases Wiki Activity

quagga,pimd: Use update-alternatives for pimd

Browse Source 
pimd is provided by both quagga and pimd, prefer quagga over pimd when
both are in image

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2020-09-01 14:29:21 -07:00
parent 0b15dce76a
commit 7df48b8014
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-protocols/quagga/quagga.inc
+5 -1
View File
@@ -40,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap"
PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" 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" CFLAGS += "-fcommon"
@@ -237,3 +237,7 @@ pkg_prerm_${PN}-ripngd () {
pkg_prerm_${PN}-isisd () { pkg_prerm_${PN}-isisd () {
${sysconfdir}/init.d/quagga stop isisd ${sysconfdir}/init.d/quagga stop isisd
} }
ALTERNATIVE_${PN} = "pimd"
ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd"
meta-networking/recipes-support/pimd/pimd_2.3.2.bb
+5 -1
View File
@@ -12,9 +12,13 @@ SRC_URI[sha256sum] = "c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054
EXTRA_OECONF_append_libc-musl = " --embedded-libc" EXTRA_OECONF_append_libc-musl = " --embedded-libc"
inherit autotools-brokensep inherit autotools-brokensep update-alternatives
do_configure() { do_configure() {
oe_runconf oe_runconf
} }
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "pimd"
ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd"