[PATCH 1/2] libyang: Include in the core distribution

[PATCH 1/2] libyang: Include in the core distribution

[Michael Tremer]

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

This isn't only a build dependency for FRR, but is required at runtime
as well.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/common/libyang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/rootfiles/common/libyang b/config/rootfiles/common/libyang
index 433b09fc8..f77ef8b70 100644
--- a/config/rootfiles/common/libyang
+++ b/config/rootfiles/common/libyang
@@ -24,8 +24,8 @@
 #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/libyang.so.2
+usr/lib/libyang.so.2.1.4
 #usr/lib/pkgconfig
 #usr/lib/pkgconfig/libyang.pc
 #usr/share/man/man1/yanglint.1
-- 
2.30.2

[PATCH 2/2] frr: Depend on elfutils

[Michael Tremer]

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

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/frr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lfs/frr b/lfs/frr
index 1af776eb6..04f1aa590 100644
--- a/lfs/frr
+++ b/lfs/frr
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = frr
-PAK_VER    = 2
+PAK_VER    = 3
 
-DEPS       =
+DEPS       = elfutils
 
 CFLAGS    += -fcommon
 
-- 
2.30.2

Re: [PATCH 1/2] libyang: Include in the core distribution

[Adolf Belka]

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

I missed that when I updated frr.

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 22/01/2022 11:18, Michael Tremer wrote:
> This isn't only a build dependency for FRR, but is required at runtime
> as well.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   config/rootfiles/common/libyang | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/config/rootfiles/common/libyang b/config/rootfiles/common/libyang
> index 433b09fc8..f77ef8b70 100644
> --- a/config/rootfiles/common/libyang
> +++ b/config/rootfiles/common/libyang
> @@ -24,8 +24,8 @@
>   #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/libyang.so.2
> +usr/lib/libyang.so.2.1.4
>   #usr/lib/pkgconfig
>   #usr/lib/pkgconfig/libyang.pc
>   #usr/share/man/man1/yanglint.1

Re: [PATCH 2/2] frr: Depend on elfutils

[Adolf Belka]

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

Missed that change as well. Thanks for finding and fixing it.

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 22/01/2022 11:18, Michael Tremer wrote:
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   lfs/frr | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lfs/frr b/lfs/frr
> index 1af776eb6..04f1aa590 100644
> --- a/lfs/frr
> +++ b/lfs/frr
> @@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
>   DIR_APP    = $(DIR_SRC)/$(THISAPP)
>   TARGET     = $(DIR_INFO)/$(THISAPP)
>   PROG       = frr
> -PAK_VER    = 2
> +PAK_VER    = 3
>   
> -DEPS       =
> +DEPS       = elfutils
>   
>   CFLAGS    += -fcommon
>