From 0e18e9be0f7211ecc4555f9dc178759166d13c7a Mon Sep 17 00:00:00 2001
From: Martin Winter <mwinter@opensourcerouting.org>
Date: Tue, 17 Aug 2021 19:49:42 +0200
Subject: snapcraft: Change base to Ubuntu 18.04 and libyang 2.0.7

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---
 snapcraft/README.snap_build.md |  3 +--
 snapcraft/snapcraft.yaml.in    | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'snapcraft')

diff --git a/snapcraft/README.snap_build.md b/snapcraft/README.snap_build.md
index e43f63f2d..b96612f53 100644
--- a/snapcraft/README.snap_build.md
+++ b/snapcraft/README.snap_build.md
@@ -1,7 +1,6 @@
 Building your own FRRouting Snap
 ========================================
-(Tested on Ubuntu 16.04 with Snap Version 2, does not work on Ubuntu 15.x
-which uses earlier versions of snaps)
+(Tested on Ubuntu 18.04)
 
 1. Install snapcraft:
 
diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in
index 1836f3497..2c9154619 100644
--- a/snapcraft/snapcraft.yaml.in
+++ b/snapcraft/snapcraft.yaml.in
@@ -9,6 +9,7 @@ description: BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP/EIGRP/BFD routing daemon
  FRRouting (frr) is a fork of Quagga.
 confinement: strict
 grade: devel
+base: core18
 
 apps:
     vtysh:
@@ -254,6 +255,7 @@ parts:
            - libssh-dev
         stage-packages:
            - libssh-4
+           - zlib1g
         prime:
            - lib/librtr.so*
            - usr/lib/x86_64-linux-gnu/libssh.so*
@@ -268,12 +270,12 @@ parts:
            - cmake
            - make
            - gcc
-           - libpcre3-dev
+           - libpcre2-dev
         stage-packages:
-           - libpcre3
+           - libpcre2-8-0
         source: https://github.com/CESNET/libyang.git
         source-type: git
-        source-tag: v1.0.184
+        source-tag: v2.0.7
         plugin: cmake
         configflags:
            - -DCMAKE_INSTALL_PREFIX:PATH=/usr
@@ -298,7 +300,6 @@ parts:
            - imagemagick
            - ghostscript
            - groff
-           - hardening-wrapper
            - libpcre3-dev
            - chrpath
            - pkg-config
@@ -315,12 +316,20 @@ parts:
            - logrotate
            - libcap2
            - libtinfo5
-           - libreadline6
-           - libjson-c2
+           - libreadline7
+           - libjson-c3
            - libc-ares2
            - libatm1
            - libprotobuf-c1
            - libdb5.3
+           - libacl1
+           - libattr1
+           - libaudit1
+           - libcap-ng0
+           - libpam0g
+           - libpcre3
+           - libselinux1
+           - libxtables12
         plugin: autotools
         source: ../frr-@PACKAGE_VERSION@.tar.gz
         configflags:
@@ -376,6 +385,8 @@ parts:
         stage-packages:
            - telnet
            - traceroute
+           - libgcc1
+           - libstdc++6
         plugin: make
         source: helpers
         prime:
@@ -390,8 +401,3 @@ parts:
             README.snap_build.md: doc/README.snap_build.md
             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
-
-- 
cgit v1.2.3