Skip to contentSkip to conversation

frr: use update-alternatives to solve conflicts with libsmi

PATCH New [email protected] 1 participant 2 messages Jun 13, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 frr: use update-alternatives to solve conflicts with libsmi

From: Wang Mingyu <[email protected]>

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.

---
 meta-networking/recipes-protocols/frr/frr_10.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-protocols/frr/frr_10.0.bb +4 -1
index bdc359667..afd2c95a0 100644
@@ -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
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 libsmi: use update-alternatives to solve conflicts with frr

From: Wang Mingyu <[email protected]>

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

frr also uses the doc 'ietf-netconf-acm.yang ietf-netconf-with-defaults.yang ietf-netconf.yang'. frr has a priority of 100.

---
 meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +4 -1
index 73aeb5539..1f7442af0 100644
@@ -18,8 +18,11 @@ DEPENDS += "bison-native flex-native wget-native gawk-native"
 
 inherit autotools-brokensep update-alternatives
 ALTERNATIVE_PRIORITY = "50"
-ALTERNATIVE:${PN}-yang = "ietf-interfaces "
+ALTERNATIVE:${PN}-yang = " 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"
 
 EXTRA_OECONF:class-native = "ac_cv_path_SH=/bin/sh"
 EXTRA_OECONF:class-target = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk"
Signature · 1 line
2.34.1