From 33d4d55b60dae42841639522727fac3dfaf2ad29 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 13 Jun 2024 11:43:25 +0800 Subject: [PATCH] libsmi: use update-alternatives to solve conflicts with frr 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. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 73aeb55393..1f7442af07 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -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"