frr: update to 10.1.1

recipes-extended/libyang/libyang_2.1.111.bb → recipes-extended/libyang/libyang_2.1.148.bb

@@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad"
 
-SRCREV = "8b0b910a2dcb7360cb5b0aaefbd1338271d50946"
+SRCREV = "fc4dbd923e044006c93df020590a1e5a8656c09e"
 
 SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \
            file://0001-test_context-skip-test-case-test_searchdirs.patch \

recipes-protocols/frr/files/frr.service

@@ -18,9 +18,9 @@ RestartSec=5
 Restart=on-abnormal
 LimitNOFILE=1024
 PIDFile=/var/run/frr/watchfrr.pid
-ExecStart=/usr/lib/frr/frrinit.sh start
-ExecStop=/usr/lib/frr/frrinit.sh stop
-ExecReload=/usr/lib/frr/frrinit.sh reload
+ExecStart=/usr/libexec/frr/frrinit.sh start
+ExecStop=/usr/libexec/frr/frrinit.sh stop
+ExecReload=/usr/libexec/frr/frrinit.sh reload
 
 [Install]
 WantedBy=multi-user.target

recipes-protocols/frr/files/frr@.service

@@ -18,9 +18,9 @@ RestartSec=5
 Restart=on-abnormal
 LimitNOFILE=1024
 PIDFile=/var/run/frr/%I/watchfrr.pid
-ExecStart=/usr/lib/frr/frrinit.sh start %I
-ExecStop=/usr/lib/frr/frrinit.sh stop %I
-ExecReload=/usr/lib/frr/frrinit.sh reload %I
+ExecStart=/usr/libexec/frr/frrinit.sh start %I
+ExecStop=/usr/libexec/frr/frrinit.sh stop %I
+ExecReload=/usr/libexec/frr/frrinit.sh reload %I
 
 [Install]
 WantedBy=multi-user.target

recipes-protocols/frr/files/support_bundle_commands.conf

@@ -34,6 +34,8 @@ show bgp nexthop
 show bgp vrf all summary
 show bgp vrf all ipv4
 show bgp vrf all ipv6
+show bgp vrf all ipv4 vpn
+show bgp vrf all ipv6 vpn
 show bgp vrf all neighbors
 
 show bgp evpn route
@@ -78,9 +80,9 @@ show vrf
 show work-queues
 show debugging hashtable
 show running-config
-show thread cpu
-show thread poll
-show thread timers
+show event cpu
+show event poll
+show event timers
 show daemons
 show version
 CMD_LIST_END
@@ -192,7 +194,7 @@ CMD_LIST_END
 PROC_NAME:ospf6
 CMD_LIST_START
 show ipv6 ospf6 vrf all
-show ipv6 ospf6 vrfs 
+show ipv6 ospf6 vrfs
 show ipv6 ospf6 vrf all border-routers
 show ipv6 ospf6 vrf all border-routers detail
 show ipv6 ospf6 vrf all database
@@ -258,3 +260,19 @@ show ipv6 pim bsr
 show ipv6 pim bsrp-info
 show ipv6 pim bsm-databases
 CMD_LIST_END
+
+#MGMT Support Bundle Command List
+PROC_NAME:mgmt
+CMD_LIST_START
+show mgmt backend-adapter all
+show mgmt backend-yang-xpath-registry
+show mgmt commit-history
+show mgmt datastore all
+show mgmt datastore-contents candidate json
+show mgmt datastore-contents running json
+show mgmt frontend-adapter all detail
+show mgmt get-config candidate /
+show mgmt get-config running /
+show mgmt transaction all
+show mgmt yang-xpath-subscription /
+CMD_LIST_END

recipes-protocols/frr/frr_9.0.3.bb → recipes-protocols/frr/frr_10.1.1.bb

@@ -9,12 +9,12 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.0 \
-           file://0001-CVE-2024-44070.patch \
+
+SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \
            file://frr.pam \
            "
 
-SRCREV = "d8319ddcce37045cd4f5692981664df1445f2097"
+SRCREV = "dbf8dac1cea2b1235746e2d966a8ded9cffd5dc3"
 
 UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$"
 
@@ -45,7 +45,7 @@ PACKAGECONFIG[ospfclient] = "--enable-ospfapi --enable-ospfclient,--disable-ospf
 
 EXTRA_OECONF:class-native = "--enable-clippy-only"
 
-EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \
+EXTRA_OECONF:class-target = "--sbindir=${libexecdir}/frr \
                              --sysconfdir=${sysconfdir}/frr \
                              --localstatedir=${localstatedir}/run/frr \
                              --enable-vtysh \
@@ -73,6 +73,11 @@ SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "frr.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
+inherit update-alternatives multilib_script multilib_header
+
+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
@@ -89,6 +94,7 @@ do_install:class-native () {
 
 do_install:append:class-target () {
     install -m 0755 -d ${D}${sysconfdir}/frr
+    install -m 0755 -d ${D}${libexecdir}/frr
     install -m 0640 ${S}/tools/etc/frr/* ${D}${sysconfdir}/frr/
     chown frr:frrvty ${D}${sysconfdir}/frr
     chown frr:frr ${D}${sysconfdir}/frr/*
@@ -117,6 +123,7 @@ do_install:append:class-target () {
         echo "d /run/frr 0755 frr frr -" \
             > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
     fi
+    oe_multilib_header frr/version.h
 }
 
 USERADD_PACKAGES = "${PN}"

recipes-protocols/frr/frr_9.0.3.bbappend → recipes-protocols/frr/frr_10.1.1.bbappend

@@ -6,7 +6,7 @@ SRC_URI:append = " \
            file://support_bundle_commands.conf;subdir=git/tools/etc/frr \
            "
 
-PR = "r2"
+PR = "r1"
 
 SYSTEMD_AUTO_ENABLE = "enable"