From 0d4a6bd23c239c282b4cb1f94891ddc48cda2b60 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Thu, 27 Apr 2017 23:26:20 -0700 Subject: [PATCH 1/3] snapcraft: Fix missing files in "make dist" target Signed-off-by: Martin Winter --- snapcraft/Makefile.am | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/snapcraft/Makefile.am b/snapcraft/Makefile.am index 75f768e942..2ec39ce5b7 100644 --- a/snapcraft/Makefile.am +++ b/snapcraft/Makefile.am @@ -1,25 +1,7 @@ EXTRA_DIST = snapcraft.yaml \ README.snap_build.md \ README.usage.md \ - scripts/Makefile \ - scripts/bgpd-service \ - scripts/isisd-service \ - scripts/ldpd-service \ - scripts/ospf6d-service \ - scripts/ospfd-service \ - scripts/pimd-service \ - scripts/ripd-service \ - scripts/ripngd-service \ - scripts/zebra-service \ - defaults/bgpd.conf.default \ - defaults/isisd.conf.default \ - defaults/ldpd.conf.default \ - defaults/ospf6d.conf.default \ - defaults/ospfd.conf.default \ - defaults/pimd.conf.default \ - defaults/ripd.conf.default \ - defaults/ripngd.conf.default \ - defaults/vtysh.conf.default \ - defaults/zebra.conf.default \ + scripts \ + defaults \ helpers \ snap From 8ccfe8f8752a34ad3a1c85f0d29992de666a9c03 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Thu, 27 Apr 2017 23:41:04 -0700 Subject: [PATCH 2/3] snapcraft: Add support for extra version information - frr.version snap command will now show the contents of extra_version_info.txt in addition to the zebra --version output Signed-off-by: Martin Winter --- snapcraft/Makefile.am | 1 + snapcraft/README.snap_build.md | 9 +++++++-- snapcraft/extra_version_info.txt | 0 snapcraft/scripts/Makefile | 2 ++ snapcraft/scripts/show_version | 6 ++++++ snapcraft/snapcraft.yaml.in | 3 ++- 6 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 snapcraft/extra_version_info.txt create mode 100644 snapcraft/scripts/show_version diff --git a/snapcraft/Makefile.am b/snapcraft/Makefile.am index 2ec39ce5b7..a8220670d1 100644 --- a/snapcraft/Makefile.am +++ b/snapcraft/Makefile.am @@ -1,6 +1,7 @@ EXTRA_DIST = snapcraft.yaml \ README.snap_build.md \ README.usage.md \ + extra_version_info.txt \ scripts \ defaults \ helpers \ diff --git a/snapcraft/README.snap_build.md b/snapcraft/README.snap_build.md index e1f2ce82da..eeee6a17ad 100644 --- a/snapcraft/README.snap_build.md +++ b/snapcraft/README.snap_build.md @@ -12,7 +12,12 @@ which uses earlier versions of snaps) git clone https://github.com/frrouting/frr.git cd frr -3. Run Bootstrap and make distribution tar.gz +3. (Optional) Add extra version information to + `snapcraft/extra_version_info.txt`. Information in this file will + be displayed with the frr.version command (simple `cat` after + the display of the `zebra --version` output) + +4. Run Bootstrap and make distribution tar.gz ./bootstrap.sh ./configure --with-pkg-extra-version=-MySnapVersion @@ -25,7 +30,7 @@ which uses earlier versions of snaps) This will build `frr-something.tar.gz` - the distribution tar and the snapcraft/snapcraft.yaml with the matching version number -4. Create snap +5. Create snap cd snapcraft snapcraft diff --git a/snapcraft/extra_version_info.txt b/snapcraft/extra_version_info.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/snapcraft/scripts/Makefile b/snapcraft/scripts/Makefile index 2a60d4d652..966623d11d 100644 --- a/snapcraft/scripts/Makefile +++ b/snapcraft/scripts/Makefile @@ -13,3 +13,5 @@ install: install -D -m 0755 ldpd-service $(DESTDIR)/bin/ install -D -m 0755 nhrpd-service $(DESTDIR)/bin/ install -D -m 0755 set-options $(DESTDIR)/bin/ + install -D -m 0755 show_version $(DESTDIR)/bin/ + diff --git a/snapcraft/scripts/show_version b/snapcraft/scripts/show_version new file mode 100644 index 0000000000..ca1c2aa28d --- /dev/null +++ b/snapcraft/scripts/show_version @@ -0,0 +1,6 @@ +#!/bin/sh + +$SNAP/sbin/zebra --version +$SNAP/bin/cat $SNAP/doc/extra_version_info.txt + +exit 0 diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in index b5fb24a361..2112e061d6 100644 --- a/snapcraft/snapcraft.yaml.in +++ b/snapcraft/snapcraft.yaml.in @@ -17,7 +17,7 @@ apps: - network-bind - network-control version: - command: sbin/zebra --version + command: bin/show_version readme: command: bin/cat $SNAP/doc/README.usage.md zebra: @@ -254,4 +254,5 @@ parts: organize: README.usage.md: doc/README.usage.md README.snap_build.md: doc/README.snap_build.md + extra_version_info.txt: doc/extra_version_info.txt From b9f34c621553d37dbe20f0b1da122987eea7be64 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 28 Apr 2017 03:11:51 -0700 Subject: [PATCH 3/3] snapcraft: Clean up old no longer used configure flags Signed-off-by: Martin Winter --- snapcraft/snapcraft.yaml.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in index 2112e061d6..eb61301953 100644 --- a/snapcraft/snapcraft.yaml.in +++ b/snapcraft/snapcraft.yaml.in @@ -192,12 +192,6 @@ parts: plugin: autotools source: ../frr-@PACKAGE_VERSION@.tar.gz configflags: - - --with-cflags=-g - - --with-cflags=-O0 - - --with-cflags=-std=gnu99 - - --with-cflags=-fpie - - --with-cflags=-fno-omit-frame-pointer - - --with-cflags=-Wall - --enable-vtysh - --enable-isisd - --enable-watchfrr @@ -206,7 +200,6 @@ parts: - --enable-multipath=64 - --enable-rtadv - --enable-irdp - - --enable-gcc-rdynamic - --enable-user=root - --enable-group=root - --enable-pimd