From 4ea46a31b95147aec18118add5349dda70065a2b Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 12 Jan 2024 10:50:23 +0800 Subject: [PATCH] frr: use update-alternatives for ietf-interfaces.yang Error: Transaction test error: file /usr/share/yang/ietf-interfaces.yang conflicts between attempted installs of libsmi-yang-0.5.0-r0.cortexa57 and frr-9.1-r1.cortexa57 libsmi also uses the doc 'ietf-interfaces.yang'. libsmi has a priority of 50. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/frr/frr_9.1.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-networking/recipes-protocols/frr/frr_9.1.bb b/meta-networking/recipes-protocols/frr/frr_9.1.bb index 9db6710d9c..5cc19d09d0 100644 --- a/meta-networking/recipes-protocols/frr/frr_9.1.bb +++ b/meta-networking/recipes-protocols/frr/frr_9.1.bb @@ -74,6 +74,11 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "frr.service" SYSTEMD_AUTO_ENABLE = "disable" +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = " ietf-interfaces " +ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" do_compile:prepend () { sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ -e 's#${RECIPE_SYSROOT}##g' ${S}/lib/version.h