Re: [PATCH 2/2] libyang: New dependency for frr build

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 6383 bytes --]

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 4 Aug 2021, at 23:16, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> - Impementation of libyang 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>
> ---
> config/rootfiles/common/libyang | 31 ++++++++++++
> lfs/libyang                     | 88 +++++++++++++++++++++++++++++++++
> make.sh                         |  1 +
> 3 files changed, 120 insertions(+)
> create mode 100644 config/rootfiles/common/libyang
> create mode 100644 lfs/libyang
> 
> 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/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 d78fb2ff0..cfa4cfc8e 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1577,6 +1577,7 @@ buildipfire() {
>   lfsmake2 ipset
>   lfsmake2 dnsdist
>   lfsmake2 bird
> +  lfsmake2 libyang
>   lfsmake2 frr
>   lfsmake2 dmidecode
>   lfsmake2 mcelog
> -- 
> 2.32.0
>