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 <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2017-04-27 23:41:04 -07:00
parent 0d4a6bd23c
commit 8ccfe8f875
6 changed files with 18 additions and 3 deletions

View file

@ -1,6 +1,7 @@
EXTRA_DIST = snapcraft.yaml \ EXTRA_DIST = snapcraft.yaml \
README.snap_build.md \ README.snap_build.md \
README.usage.md \ README.usage.md \
extra_version_info.txt \
scripts \ scripts \
defaults \ defaults \
helpers \ helpers \

View file

@ -12,7 +12,12 @@ which uses earlier versions of snaps)
git clone https://github.com/frrouting/frr.git git clone https://github.com/frrouting/frr.git
cd frr 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 ./bootstrap.sh
./configure --with-pkg-extra-version=-MySnapVersion ./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 This will build `frr-something.tar.gz` - the distribution tar and
the snapcraft/snapcraft.yaml with the matching version number the snapcraft/snapcraft.yaml with the matching version number
4. Create snap 5. Create snap
cd snapcraft cd snapcraft
snapcraft snapcraft

View file

View file

@ -13,3 +13,5 @@ install:
install -D -m 0755 ldpd-service $(DESTDIR)/bin/ install -D -m 0755 ldpd-service $(DESTDIR)/bin/
install -D -m 0755 nhrpd-service $(DESTDIR)/bin/ install -D -m 0755 nhrpd-service $(DESTDIR)/bin/
install -D -m 0755 set-options $(DESTDIR)/bin/ install -D -m 0755 set-options $(DESTDIR)/bin/
install -D -m 0755 show_version $(DESTDIR)/bin/

View file

@ -0,0 +1,6 @@
#!/bin/sh
$SNAP/sbin/zebra --version
$SNAP/bin/cat $SNAP/doc/extra_version_info.txt
exit 0

View file

@ -17,7 +17,7 @@ apps:
- network-bind - network-bind
- network-control - network-control
version: version:
command: sbin/zebra --version command: bin/show_version
readme: readme:
command: bin/cat $SNAP/doc/README.usage.md command: bin/cat $SNAP/doc/README.usage.md
zebra: zebra:
@ -254,4 +254,5 @@ parts:
organize: organize:
README.usage.md: doc/README.usage.md README.usage.md: doc/README.usage.md
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