From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH 1/2] frr: Update to version 8.0 Date: Sun, 12 Sep 2021 21:27:05 +0200 Message-ID: <65f91fc2-92f5-3073-9fad-e42e8d4d82ac@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1342463415747186734==" List-Id: --===============1342463415747186734== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Arne, On 12/09/2021 18:47, Arne Fitzenreiter wrote: > Is the name change from frr to frr-frr intended? >=20 > On github the file is still called frr-8.0.gz The source file I found came up with the name frr-frr. I have had this proble= m before when a package has multiple locations for a file with slightly diffe= rent details and I have no idea if I have chosen the right location or even h= ow to identify where the IPFire source file normally comes from. Usually, I f= ind where Arch Linux gets it file from and copy that. If you can send me the URL for the correct frr file I will redo the patch wit= h the correct source file, plus I will update to the newer version that Matth= ias mentioned that deals with a lot of bugs. Sorry for my bad. Regards, Adolf. >=20 > Arne >=20 >=20 >=20 > Am 2021-08-04 23:16, schrieb Adolf Belka: >> - Update from 6.0 to 8.0 >> - 8.0 requires libyang for the build. Introduced with separate patch >> in this series. >> - 6.0 is only compilable with python2. >> =C2=A0 python3 compatability was introduced in version 7.4 >> - Confirmed that building frr-8.0 worked with only python3 available >> - Added --disable-static to the ./configure options. >> - Rootfile updated >> - Changelog from 6.0 to 8.0 is too large to include here. It can be >> viewed to obtain >> =C2=A0=C2=A0 more details at https://github.com/FRRouting/frr/releases >> =C2=A0 In version 8.0 there are over 2200 commits from 91 different author= s. >> =C2=A0 The frr developers expect to release a bugfix point release >> relatively soon after this >> =C2=A0 version which was released on 29th July 2021. >> >> Signed-off-by: Adolf Belka >> --- >> =C2=A0config/rootfiles/packages/frr | 110 ++++++++++++++++++++++++++++----= -- >> =C2=A0lfs/frr=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2= =A0 14 +++-- >> =C2=A02 files changed, 100 insertions(+), 24 deletions(-) >> >> diff --git a/config/rootfiles/packages/frr b/config/rootfiles/packages/frr >> index 8aafc7c6c..3733e5a1c 100644 >> --- a/config/rootfiles/packages/frr >> +++ b/config/rootfiles/packages/frr >> @@ -1,17 +1,12 @@ >> -#etc/frr >> -etc/frr/bgpd.conf.sample >> -etc/frr/bgpd.conf.sample2 >> -etc/frr/bgpd.conf.vnc.sample >> -etc/frr/ospfd.conf.sample >> -etc/frr/ripngd.conf.sample >> -etc/frr/staticd.conf.sample >> -etc/frr/vtysh.conf.sample >> -etc/frr/zebra.conf.sample >> =C2=A0etc/rc.d/init.d/frr >> -usr/bin/bgp_btoa >> =C2=A0usr/bin/vtysh >> =C2=A0#usr/include/frr >> +#usr/include/frr/agg_table.h >> +#usr/include/frr/assert.h >> +#usr/include/frr/atomlist.h >> =C2=A0#usr/include/frr/bfd.h >> +#usr/include/frr/bfdd >> +#usr/include/frr/bfdd/bfddp_packet.h >> =C2=A0#usr/include/frr/bitfield.h >> =C2=A0#usr/include/frr/buffer.h >> =C2=A0#usr/include/frr/checksum.h >> @@ -20,24 +15,29 @@ usr/bin/vtysh >> =C2=A0#usr/include/frr/command_match.h >> =C2=A0#usr/include/frr/compiler.h >> =C2=A0#usr/include/frr/csv.h >> +#usr/include/frr/db.h >> =C2=A0#usr/include/frr/debug.h >> +#usr/include/frr/defaults.h >> =C2=A0#usr/include/frr/distribute.h >> =C2=A0#usr/include/frr/eigrpd >> =C2=A0#usr/include/frr/eigrpd/eigrp_dump.h >> =C2=A0#usr/include/frr/eigrpd/eigrp_topology.h >> =C2=A0#usr/include/frr/eigrpd/eigrpd.h >> -#usr/include/frr/event_counter.h >> =C2=A0#usr/include/frr/ferr.h >> -#usr/include/frr/fifo.h >> =C2=A0#usr/include/frr/filter.h >> =C2=A0#usr/include/frr/freebsd-queue.h >> =C2=A0#usr/include/frr/frr_pthread.h >> =C2=A0#usr/include/frr/frratomic.h >> +#usr/include/frr/frrcu.h >> +#usr/include/frr/frrlua.h >> +#usr/include/frr/frrscript.h >> =C2=A0#usr/include/frr/frrstr.h >> =C2=A0#usr/include/frr/getopt.h >> =C2=A0#usr/include/frr/graph.h >> =C2=A0#usr/include/frr/hash.h >> =C2=A0#usr/include/frr/hook.h >> +#usr/include/frr/iana_afi.h >> +#usr/include/frr/id_alloc.h >> =C2=A0#usr/include/frr/if.h >> =C2=A0#usr/include/frr/if_rmap.h >> =C2=A0#usr/include/frr/imsg.h >> @@ -45,21 +45,29 @@ usr/bin/vtysh >> =C2=A0#usr/include/frr/jhash.h >> =C2=A0#usr/include/frr/json.h >> =C2=A0#usr/include/frr/keychain.h >> +#usr/include/frr/ldp_sync.h >> =C2=A0#usr/include/frr/lib_errors.h >> +#usr/include/frr/lib_vty.h >> =C2=A0#usr/include/frr/libfrr.h >> +#usr/include/frr/libfrr_trace.h >> =C2=A0#usr/include/frr/libospf.h >> +#usr/include/frr/link_state.h >> =C2=A0#usr/include/frr/linklist.h >> =C2=A0#usr/include/frr/log.h >> -#usr/include/frr/logicalrouter.h >> +#usr/include/frr/log_vty.h >> =C2=A0#usr/include/frr/md5.h >> =C2=A0#usr/include/frr/memory.h >> -#usr/include/frr/memory_vty.h >> +#usr/include/frr/mlag.h >> =C2=A0#usr/include/frr/module.h >> =C2=A0#usr/include/frr/monotime.h >> =C2=A0#usr/include/frr/mpls.h >> =C2=A0#usr/include/frr/network.h >> =C2=A0#usr/include/frr/nexthop.h >> =C2=A0#usr/include/frr/nexthop_group.h >> +#usr/include/frr/nexthop_group_private.h >> +#usr/include/frr/northbound.h >> +#usr/include/frr/northbound_cli.h >> +#usr/include/frr/northbound_db.h >> =C2=A0#usr/include/frr/ns.h >> =C2=A0#usr/include/frr/openbsd-queue.h >> =C2=A0#usr/include/frr/openbsd-tree.h >> @@ -76,29 +84,39 @@ usr/bin/vtysh >> =C2=A0#usr/include/frr/ospfd/ospfd.h >> =C2=A0#usr/include/frr/pbr.h >> =C2=A0#usr/include/frr/plist.h >> -#usr/include/frr/pqueue.h >> =C2=A0#usr/include/frr/prefix.h >> +#usr/include/frr/printfrr.h >> =C2=A0#usr/include/frr/privs.h >> =C2=A0#usr/include/frr/ptm_lib.h >> +#usr/include/frr/pullwr.h >> =C2=A0#usr/include/frr/pw.h >> =C2=A0#usr/include/frr/qobj.h >> =C2=A0#usr/include/frr/queue.h >> +#usr/include/frr/resolver.h >> =C2=A0#usr/include/frr/ringbuf.h >> =C2=A0#usr/include/frr/route_types.h >> =C2=A0#usr/include/frr/routemap.h >> +#usr/include/frr/routing_nb.h >> =C2=A0#usr/include/frr/sbuf.h >> +#usr/include/frr/seqlock.h >> =C2=A0#usr/include/frr/sha256.h >> =C2=A0#usr/include/frr/sigevent.h >> =C2=A0#usr/include/frr/skiplist.h >> +#usr/include/frr/smux.h >> =C2=A0#usr/include/frr/sockopt.h >> =C2=A0#usr/include/frr/sockunion.h >> =C2=A0#usr/include/frr/spf_backoff.h >> =C2=A0#usr/include/frr/srcdest_table.h >> +#usr/include/frr/srte.h >> +#usr/include/frr/srv6.h >> =C2=A0#usr/include/frr/stream.h >> =C2=A0#usr/include/frr/systemd.h >> =C2=A0#usr/include/frr/table.h >> =C2=A0#usr/include/frr/termtable.h >> =C2=A0#usr/include/frr/thread.h >> +#usr/include/frr/trace.h >> +#usr/include/frr/typerb.h >> +#usr/include/frr/typesafe.h >> =C2=A0#usr/include/frr/vector.h >> =C2=A0#usr/include/frr/version.h >> =C2=A0#usr/include/frr/vlan.h >> @@ -108,22 +126,78 @@ usr/bin/vtysh >> =C2=A0#usr/include/frr/vxlan.h >> =C2=A0#usr/include/frr/wheel.h >> =C2=A0#usr/include/frr/workqueue.h >> -#usr/include/frr/zassert.h >> +#usr/include/frr/xref.h >> +#usr/include/frr/yang.h >> +#usr/include/frr/yang_translator.h >> +#usr/include/frr/yang_wrappers.h >> =C2=A0#usr/include/frr/zclient.h >> =C2=A0#usr/include/frr/zebra.h >> -#usr/lib/libfrr.a >> +#usr/include/frr/zlog.h >> +#usr/include/frr/zlog_targets.h >> +#usr/lib/frr >> +#usr/lib/frr/modules >> +#usr/lib/frr/modules/bgpd_bmp.la >> +#usr/lib/frr/modules/bgpd_bmp.so >> +#usr/lib/frr/modules/dplane_fpm_nl.la >> +#usr/lib/frr/modules/dplane_fpm_nl.so >> +#usr/lib/frr/modules/pathd_pcep.la >> +#usr/lib/frr/modules/pathd_pcep.so >> +#usr/lib/frr/modules/zebra_cumulus_mlag.la >> +#usr/lib/frr/modules/zebra_cumulus_mlag.so >> =C2=A0#usr/lib/libfrr.la >> =C2=A0#usr/lib/libfrr.so >> =C2=A0usr/lib/libfrr.so.0 >> =C2=A0usr/lib/libfrr.so.0.0.0 >> +#usr/lib/libfrrcares.la >> +#usr/lib/libfrrcares.so >> +usr/lib/libfrrcares.so.0 >> +usr/lib/libfrrcares.so.0.0.0 >> =C2=A0usr/sbin/bgpd >> +usr/sbin/fabricd >> =C2=A0usr/sbin/frr >> =C2=A0usr/sbin/frr-reload >> =C2=A0usr/sbin/frr-reload.py >> +usr/sbin/frrcommon.sh >> +usr/sbin/frrinit.sh >> +usr/sbin/generate_support_bundle.py >> =C2=A0usr/sbin/ospfd >> -usr/sbin/rfptest >> +usr/sbin/pathd >> =C2=A0usr/sbin/ssd >> =C2=A0usr/sbin/staticd >> +usr/sbin/vrrpd >> =C2=A0usr/sbin/watchfrr >> +usr/sbin/watchfrr.sh >> =C2=A0usr/sbin/zebra >> +#usr/share/yang >> +#usr/share/yang/frr-bgp-bmp.yang >> +#usr/share/yang/frr-bgp-common-multiprotocol.yang >> +#usr/share/yang/frr-bgp-common-structure.yang >> +#usr/share/yang/frr-bgp-common.yang >> +#usr/share/yang/frr-bgp-filter.yang >> +#usr/share/yang/frr-bgp-neighbor.yang >> +#usr/share/yang/frr-bgp-peer-group.yang >> +#usr/share/yang/frr-bgp-route-map.yang >> +#usr/share/yang/frr-bgp-rpki.yang >> +#usr/share/yang/frr-bgp-types.yang >> +#usr/share/yang/frr-bgp.yang >> +#usr/share/yang/frr-deviations-bgp-datacenter.yang >> +#usr/share/yang/frr-filter.yang >> +#usr/share/yang/frr-interface.yang >> +#usr/share/yang/frr-module-translator.yang >> +#usr/share/yang/frr-nexthop.yang >> +#usr/share/yang/frr-ospf-route-map.yang >> +#usr/share/yang/frr-ospf6-route-map.yang >> +#usr/share/yang/frr-pathd.yang >> +#usr/share/yang/frr-route-map.yang >> +#usr/share/yang/frr-route-types.yang >> +#usr/share/yang/frr-routing.yang >> +#usr/share/yang/frr-staticd.yang >> +#usr/share/yang/frr-test-module.yang >> +#usr/share/yang/frr-vrf.yang >> +#usr/share/yang/frr-vrrpd.yang >> +#usr/share/yang/frr-zebra-route-map.yang >> +#usr/share/yang/frr-zebra.yang >> +#usr/share/yang/ietf-bgp-types.yang >> +#usr/share/yang/ietf-interfaces.yang >> +#usr/share/yang/ietf-routing-types.yang >> =C2=A0var/ipfire/backup/addons/includes/frr >> diff --git a/lfs/frr b/lfs/frr >> index cff23ff92..fa9238947 100644 >> --- a/lfs/frr >> +++ b/lfs/frr >> @@ -24,15 +24,15 @@ >> >> =C2=A0include Config >> >> -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 6.0 >> +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 8.0 >> >> -THISAPP=C2=A0=C2=A0=C2=A0 =3D frr-$(VER) >> -DL_FILE=C2=A0=C2=A0=C2=A0 =3D $(THISAPP).tar.xz >> +THISAPP=C2=A0=C2=A0=C2=A0 =3D frr-frr-$(VER) >> +DL_FILE=C2=A0=C2=A0=C2=A0 =3D $(THISAPP).tar.gz >> =C2=A0DL_FROM=C2=A0=C2=A0=C2=A0 =3D $(URL_IPFIRE) >> =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0 =3D $(DIR_SRC)/$(THISAPP) >> =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(DIR_INFO)/$(THISAPP) >> =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D frr >> -PAK_VER=C2=A0=C2=A0=C2=A0 =3D 1 >> +PAK_VER=C2=A0=C2=A0=C2=A0 =3D 2 >> >> =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D >> >> @@ -46,7 +46,7 @@ objects =3D $(DL_FILE) >> >> =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >> >> -$(DL_FILE)_MD5 =3D d725c08e0093f58e5fcac0969c781813 >> +$(DL_FILE)_MD5 =3D 98e008c8cf717b4764827ed527c6e605 >> >> =C2=A0install : $(TARGET) >> >> @@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> =C2=A0=C2=A0=C2=A0=C2=A0 @$(PREBUILD) >> =C2=A0=C2=A0=C2=A0=C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(= DIR_DL)/$(DL_FILE) >> =C2=A0=C2=A0=C2=A0=C2=A0 $(UPDATE_AUTOMAKE) >> +=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && ./bootstrap.sh >> =C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && ./configure \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --prefix=3D/usr \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --sysconfdir=3D/etc/frr \ >> @@ -101,7 +102,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --disable-pbrd \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --disable-pimd \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --disable-ripd \ >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --disable-ripngd >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --disable-ripngd \ >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --disable-static >> =C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && make $(MAKETUNING) >> =C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && make install --===============1342463415747186734==--