From 3b79135ae0191b7211631fc4539a532e14907485 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 13 Jun 2024 11:43:24 +0800 Subject: [PATCH] frr: use update-alternatives to solve conflicts with libsmi Error: Transaction test error: file /usr/share/yang/ietf-netconf-acm.yang conflicts between attempted installs of libsmi-yang-0.5.0-r0.aarch64 and frr-10.0-r0.aarch64 file /usr/share/yang/ietf-netconf-with-defaults.yang conflicts between attempted installs of libsmi-yang-0.5.0-r0.aarch64 and frr-10.0-r0.aarch64 file /usr/share/yang/ietf-netconf.yang conflicts between attempted installs of libsmi-yang-0.5.0-r0.aarch64 and frr-10.0-r0.aarch64 libsmi also uses the doc 'ietf-netconf-acm.yang ietf-netconf-with-defaults.yang ietf-netconf.yang'. libsmi has a priority of 50. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/frr/frr_10.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/frr/frr_10.0.bb b/meta-networking/recipes-protocols/frr/frr_10.0.bb index bdc359667a..afd2c95a0e 100644 --- a/meta-networking/recipes-protocols/frr/frr_10.0.bb +++ b/meta-networking/recipes-protocols/frr/frr_10.0.bb @@ -77,8 +77,11 @@ SYSTEMD_AUTO_ENABLE = "disable" inherit update-alternatives multilib_script multilib_header ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = " ietf-interfaces " +ALTERNATIVE:${PN} = " ietf-interfaces ietf-netconf-acm ietf-netconf-with-defaults ietf-netconf" ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" +ALTERNATIVE_LINK_NAME[ietf-netconf-acm] = "${datadir}/yang/ietf-netconf-acm.yang" +ALTERNATIVE_LINK_NAME[ietf-netconf-with-defaults] = "${datadir}/yang/ietf-netconf-with-defaults.yang" +ALTERNATIVE_LINK_NAME[ietf-netconf] = "${datadir}/yang/ietf-netconf.yang" do_compile:prepend () { sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ -e 's#${RECIPE_SYSROOT}##g' ${S}/lib/version.h