From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8c855a589271b52f9d2231fd520dc73fd66509fa
Date: Fri, 17 Sep 2021 12:07:15 +0000 [thread overview]
Message-ID: <4H9t435KGzz2xmh@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 15499 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 8c855a589271b52f9d2231fd520dc73fd66509fa (commit)
via 6594738bb6c8fe0656755afeffd8d08639899b84 (commit)
from 875f43830e85e6d242e08ea0eedb5b3c2040e876 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8c855a589271b52f9d2231fd520dc73fd66509fa
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Sep 13 13:22:06 2021 +0200
libyang: New dependency for frr build
- Impementation of libyang-2.0.7 as a dependency for the build of frr
- Creation of rootfile with all entries commented out so that it is only used for the build
libyang is a YANG data modelling language parser and toolkit written (and providing API)
in C.In the future if there is demand to use these functions in frr then this package
may need to be moved from a build only option to a dependency for frr providing the
yang libraries.
- Added into make.sh just before frr
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6594738bb6c8fe0656755afeffd8d08639899b84
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Sep 13 13:22:05 2021 +0200
frr: Update to version 8.0.1
- This v2 version used the frr-8.0.1 source instead of the frr-frr-8.0 source
- Update from 6.0 to 8.0.1
- 8.0.1 requires libyang for the build. Introduced with separate patch in this series.
- 6.0 is only compilable with python2.
python3 compatability was introduced in version 7.4
- Previously confirmed that building frr-8.0 was successful with only python3 available
- Added --disable-static to the ./configure options.
- Rootfile updated
- Changelog from 6.0 to 8.0.1 is too large to include here. It can be viewed to obtain
more details at https://github.com/FRRouting/frr/releases
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/libyang | 31 +++++++++++
config/rootfiles/packages/frr | 110 +++++++++++++++++++++++++++++++++-------
lfs/frr | 9 ++--
lfs/{libtasn1 => libyang} | 22 +++++---
make.sh | 1 +
5 files changed, 143 insertions(+), 30 deletions(-)
create mode 100644 config/rootfiles/common/libyang
copy lfs/{libtasn1 => libyang} (89%)
Difference in files:
diff --git a/config/rootfiles/common/libyang b/config/rootfiles/common/libyang
new file mode 100644
index 000000000..433b09fc8
--- /dev/null
+++ b/config/rootfiles/common/libyang
@@ -0,0 +1,31 @@
+#usr/bin/yanglint
+#usr/bin/yangre
+#usr/include/libyang
+#usr/include/libyang/config.h
+#usr/include/libyang/context.h
+#usr/include/libyang/dict.h
+#usr/include/libyang/in.h
+#usr/include/libyang/libyang.h
+#usr/include/libyang/log.h
+#usr/include/libyang/out.h
+#usr/include/libyang/parser_data.h
+#usr/include/libyang/parser_schema.h
+#usr/include/libyang/plugins.h
+#usr/include/libyang/plugins_exts.h
+#usr/include/libyang/plugins_exts_compile.h
+#usr/include/libyang/plugins_exts_print.h
+#usr/include/libyang/plugins_types.h
+#usr/include/libyang/printer_data.h
+#usr/include/libyang/printer_schema.h
+#usr/include/libyang/set.h
+#usr/include/libyang/tree.h
+#usr/include/libyang/tree_data.h
+#usr/include/libyang/tree_edit.h
+#usr/include/libyang/tree_schema.h
+#usr/include/libyang/version.h
+#usr/lib/libyang.so
+#usr/lib/libyang.so.2
+#usr/lib/libyang.so.2.1.4
+#usr/lib/pkgconfig
+#usr/lib/pkgconfig/libyang.pc
+#usr/share/man/man1/yanglint.1
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
etc/rc.d/init.d/frr
-usr/bin/bgp_btoa
usr/bin/vtysh
#usr/include/frr
+#usr/include/frr/agg_table.h
+#usr/include/frr/assert.h
+#usr/include/frr/atomlist.h
#usr/include/frr/bfd.h
+#usr/include/frr/bfdd
+#usr/include/frr/bfdd/bfddp_packet.h
#usr/include/frr/bitfield.h
#usr/include/frr/buffer.h
#usr/include/frr/checksum.h
@@ -20,24 +15,29 @@ usr/bin/vtysh
#usr/include/frr/command_match.h
#usr/include/frr/compiler.h
#usr/include/frr/csv.h
+#usr/include/frr/db.h
#usr/include/frr/debug.h
+#usr/include/frr/defaults.h
#usr/include/frr/distribute.h
#usr/include/frr/eigrpd
#usr/include/frr/eigrpd/eigrp_dump.h
#usr/include/frr/eigrpd/eigrp_topology.h
#usr/include/frr/eigrpd/eigrpd.h
-#usr/include/frr/event_counter.h
#usr/include/frr/ferr.h
-#usr/include/frr/fifo.h
#usr/include/frr/filter.h
#usr/include/frr/freebsd-queue.h
#usr/include/frr/frr_pthread.h
#usr/include/frr/frratomic.h
+#usr/include/frr/frrcu.h
+#usr/include/frr/frrlua.h
+#usr/include/frr/frrscript.h
#usr/include/frr/frrstr.h
#usr/include/frr/getopt.h
#usr/include/frr/graph.h
#usr/include/frr/hash.h
#usr/include/frr/hook.h
+#usr/include/frr/iana_afi.h
+#usr/include/frr/id_alloc.h
#usr/include/frr/if.h
#usr/include/frr/if_rmap.h
#usr/include/frr/imsg.h
@@ -45,21 +45,29 @@ usr/bin/vtysh
#usr/include/frr/jhash.h
#usr/include/frr/json.h
#usr/include/frr/keychain.h
+#usr/include/frr/ldp_sync.h
#usr/include/frr/lib_errors.h
+#usr/include/frr/lib_vty.h
#usr/include/frr/libfrr.h
+#usr/include/frr/libfrr_trace.h
#usr/include/frr/libospf.h
+#usr/include/frr/link_state.h
#usr/include/frr/linklist.h
#usr/include/frr/log.h
-#usr/include/frr/logicalrouter.h
+#usr/include/frr/log_vty.h
#usr/include/frr/md5.h
#usr/include/frr/memory.h
-#usr/include/frr/memory_vty.h
+#usr/include/frr/mlag.h
#usr/include/frr/module.h
#usr/include/frr/monotime.h
#usr/include/frr/mpls.h
#usr/include/frr/network.h
#usr/include/frr/nexthop.h
#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
#usr/include/frr/ns.h
#usr/include/frr/openbsd-queue.h
#usr/include/frr/openbsd-tree.h
@@ -76,29 +84,39 @@ usr/bin/vtysh
#usr/include/frr/ospfd/ospfd.h
#usr/include/frr/pbr.h
#usr/include/frr/plist.h
-#usr/include/frr/pqueue.h
#usr/include/frr/prefix.h
+#usr/include/frr/printfrr.h
#usr/include/frr/privs.h
#usr/include/frr/ptm_lib.h
+#usr/include/frr/pullwr.h
#usr/include/frr/pw.h
#usr/include/frr/qobj.h
#usr/include/frr/queue.h
+#usr/include/frr/resolver.h
#usr/include/frr/ringbuf.h
#usr/include/frr/route_types.h
#usr/include/frr/routemap.h
+#usr/include/frr/routing_nb.h
#usr/include/frr/sbuf.h
+#usr/include/frr/seqlock.h
#usr/include/frr/sha256.h
#usr/include/frr/sigevent.h
#usr/include/frr/skiplist.h
+#usr/include/frr/smux.h
#usr/include/frr/sockopt.h
#usr/include/frr/sockunion.h
#usr/include/frr/spf_backoff.h
#usr/include/frr/srcdest_table.h
+#usr/include/frr/srte.h
+#usr/include/frr/srv6.h
#usr/include/frr/stream.h
#usr/include/frr/systemd.h
#usr/include/frr/table.h
#usr/include/frr/termtable.h
#usr/include/frr/thread.h
+#usr/include/frr/trace.h
+#usr/include/frr/typerb.h
+#usr/include/frr/typesafe.h
#usr/include/frr/vector.h
#usr/include/frr/version.h
#usr/include/frr/vlan.h
@@ -108,22 +126,78 @@ usr/bin/vtysh
#usr/include/frr/vxlan.h
#usr/include/frr/wheel.h
#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
#usr/include/frr/zclient.h
#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
#usr/lib/libfrr.la
#usr/lib/libfrr.so
usr/lib/libfrr.so.0
usr/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
usr/sbin/bgpd
+usr/sbin/fabricd
usr/sbin/frr
usr/sbin/frr-reload
usr/sbin/frr-reload.py
+usr/sbin/frrcommon.sh
+usr/sbin/frrinit.sh
+usr/sbin/generate_support_bundle.py
usr/sbin/ospfd
-usr/sbin/rfptest
+usr/sbin/pathd
usr/sbin/ssd
usr/sbin/staticd
+usr/sbin/vrrpd
usr/sbin/watchfrr
+usr/sbin/watchfrr.sh
usr/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
var/ipfire/backup/addons/includes/frr
diff --git a/lfs/frr b/lfs/frr
index cff23ff92..1af776eb6 100644
--- a/lfs/frr
+++ b/lfs/frr
@@ -24,7 +24,7 @@
include Config
-VER = 6.0
+VER = 8.0.1
THISAPP = frr-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = frr
-PAK_VER = 1
+PAK_VER = 2
DEPS =
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d725c08e0093f58e5fcac0969c781813
+$(DL_FILE)_MD5 = ef606567993da37ce6f4a8f456f77e24
install : $(TARGET)
@@ -101,7 +101,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--disable-pbrd \
--disable-pimd \
--disable-ripd \
- --disable-ripngd
+ --disable-ripngd \
+ --disable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/libyang b/lfs/libyang
new file mode 100644
index 000000000..0d7149333
--- /dev/null
+++ b/lfs/libyang
@@ -0,0 +1,88 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.0.7
+
+THISAPP = libyang-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+DEPS =
+
+CFLAGS += -fcommon
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 012ad174525527d5a5badfe91ddb8694
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ $(UPDATE_AUTOMAKE)
+ cd $(DIR_APP) && mkdir build
+ cd $(DIR_APP)/build && cmake $(DIR_APP) \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ cd $(DIR_APP)/build && make $(MAKETUNING)
+ cd $(DIR_APP)/build && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
+
diff --git a/make.sh b/make.sh
index a44a6e4bc..8b97b24df 100755
--- a/make.sh
+++ b/make.sh
@@ -1574,6 +1574,7 @@ buildipfire() {
lfsmake2 ipset
lfsmake2 dnsdist
lfsmake2 bird
+ lfsmake2 libyang
lfsmake2 frr
lfsmake2 dmidecode
lfsmake2 mcelog
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2021-09-17 12:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4H9t435KGzz2xmh@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox