snapcraft: Change base to Ubuntu 18.04 and libyang 2.0.7

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2021-08-17 19:49:42 +02:00
parent 0512687b30
commit 0e18e9be0f
No known key found for this signature in database
GPG key ID: 05A4ECF8C0102306
2 changed files with 18 additions and 13 deletions

View file

@ -1,7 +1,6 @@
Building your own FRRouting Snap Building your own FRRouting Snap
======================================== ========================================
(Tested on Ubuntu 16.04 with Snap Version 2, does not work on Ubuntu 15.x (Tested on Ubuntu 18.04)
which uses earlier versions of snaps)
1. Install snapcraft: 1. Install snapcraft:

View file

@ -9,6 +9,7 @@ description: BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP/EIGRP/BFD routing daemon
FRRouting (frr) is a fork of Quagga. FRRouting (frr) is a fork of Quagga.
confinement: strict confinement: strict
grade: devel grade: devel
base: core18
apps: apps:
vtysh: vtysh:
@ -254,6 +255,7 @@ parts:
- libssh-dev - libssh-dev
stage-packages: stage-packages:
- libssh-4 - libssh-4
- zlib1g
prime: prime:
- lib/librtr.so* - lib/librtr.so*
- usr/lib/x86_64-linux-gnu/libssh.so* - usr/lib/x86_64-linux-gnu/libssh.so*
@ -268,12 +270,12 @@ parts:
- cmake - cmake
- make - make
- gcc - gcc
- libpcre3-dev - libpcre2-dev
stage-packages: stage-packages:
- libpcre3 - libpcre2-8-0
source: https://github.com/CESNET/libyang.git source: https://github.com/CESNET/libyang.git
source-type: git source-type: git
source-tag: v1.0.184 source-tag: v2.0.7
plugin: cmake plugin: cmake
configflags: configflags:
- -DCMAKE_INSTALL_PREFIX:PATH=/usr - -DCMAKE_INSTALL_PREFIX:PATH=/usr
@ -298,7 +300,6 @@ parts:
- imagemagick - imagemagick
- ghostscript - ghostscript
- groff - groff
- hardening-wrapper
- libpcre3-dev - libpcre3-dev
- chrpath - chrpath
- pkg-config - pkg-config
@ -315,12 +316,20 @@ parts:
- logrotate - logrotate
- libcap2 - libcap2
- libtinfo5 - libtinfo5
- libreadline6 - libreadline7
- libjson-c2 - libjson-c3
- libc-ares2 - libc-ares2
- libatm1 - libatm1
- libprotobuf-c1 - libprotobuf-c1
- libdb5.3 - libdb5.3
- libacl1
- libattr1
- libaudit1
- libcap-ng0
- libpam0g
- libpcre3
- libselinux1
- libxtables12
plugin: autotools plugin: autotools
source: ../frr-@PACKAGE_VERSION@.tar.gz source: ../frr-@PACKAGE_VERSION@.tar.gz
configflags: configflags:
@ -376,6 +385,8 @@ parts:
stage-packages: stage-packages:
- telnet - telnet
- traceroute - traceroute
- libgcc1
- libstdc++6
plugin: make plugin: make
source: helpers source: helpers
prime: prime:
@ -390,8 +401,3 @@ parts:
README.snap_build.md: doc/README.snap_build.md README.snap_build.md: doc/README.snap_build.md
extra_version_info.txt: doc/extra_version_info.txt extra_version_info.txt: doc/extra_version_info.txt
passthrough:
layout:
/usr/lib/x86_64-linux-gnu/libyang1:
bind: $SNAP/usr/lib/x86_64-linux-gnu/libyang1