diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-09-01 14:29:21 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-09-01 15:37:44 -0700 |
| commit | 7df48b8014c32dbfada34163c7856db2abea5e9a (patch) | |
| tree | 54499ebbb008c16bed4dc2ea54f7ddfef8e64733 /meta-networking/recipes-protocols | |
| parent | 0b15dce76afdf132b7bf27e4ea53aeda6ee38cb9 (diff) | |
| download | meta-openembedded-7df48b8014c32dbfada34163c7856db2abea5e9a.tar.gz | |
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 <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols')
| -rw-r--r-- | meta-networking/recipes-protocols/quagga/quagga.inc | 6 |
1 files changed, 5 insertions, 1 deletions
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)}" | |||
| 40 | PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" | 40 | PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" |
| 41 | PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" | 41 | PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" |
| 42 | 42 | ||
| 43 | inherit autotools update-rc.d useradd systemd pkgconfig multilib_header | 43 | inherit autotools update-rc.d useradd systemd pkgconfig multilib_header update-alternatives |
| 44 | 44 | ||
| 45 | CFLAGS += "-fcommon" | 45 | CFLAGS += "-fcommon" |
| 46 | 46 | ||
| @@ -237,3 +237,7 @@ pkg_prerm_${PN}-ripngd () { | |||
| 237 | pkg_prerm_${PN}-isisd () { | 237 | pkg_prerm_${PN}-isisd () { |
| 238 | ${sysconfdir}/init.d/quagga stop isisd | 238 | ${sysconfdir}/init.d/quagga stop isisd |
| 239 | } | 239 | } |
| 240 | |||
| 241 | ALTERNATIVE_${PN} = "pimd" | ||
| 242 | ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd" | ||
| 243 | |||
