From d1c2443dc7990f57c8e777bd8da8f259c7414554 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 17 Mar 2017 20:43:27 -0700 Subject: [PATCH 1/2] snapcraft: Add missing snapcraft files from dist (make dist) archive Signed-off-by: Martin Winter --- snapcraft/Makefile.am | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/snapcraft/Makefile.am b/snapcraft/Makefile.am index 15813be72f..d32e18d071 100644 --- a/snapcraft/Makefile.am +++ b/snapcraft/Makefile.am @@ -1,11 +1,5 @@ EXTRA_DIST = snapcraft.yaml \ - scripts/Makefile scripts/zebra-service scripts/bgpd-service \ - scripts/isisd-service scripts/ripd-service scripts/ripngd-service \ - scripts/ospf6d-service scripts/ospfd-service \ - scripts/isisd-service scripts/pimd-service \ - scripts/ldpd-service \ - defaults/bgpd.conf.default defaults/isisd.conf.default \ - defaults/ospf6d.conf.default defaults/ospfd.conf.default \ - defaults/pimd.conf.default defaults/zebra.conf.default \ - defaults/ripd.conf.default defaults/ripngd.conf.default \ - defaults/ldpd.conf.default defaults/vtysh.conf.default + README.* \ + scripts/Makefile scripts/*-service \ + defaults/*.conf.default \ + helpers setup From 567dd75c077b36f0001d771bb287ae55c9312363 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 17 Mar 2017 20:50:09 -0700 Subject: [PATCH 2/2] snapcraft: Change setup/ to snap/ directory based on new snap format DEPRECATED: Assets in 'setup/gui' should now be placed in 'snap/gui'. See http://snapcraft.io/docs/deprecation-notices/dn3 for more information. Signed-off-by: Martin Winter --- snapcraft/Makefile.am | 2 +- snapcraft/{setup => snap}/gui/icon.png | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename snapcraft/{setup => snap}/gui/icon.png (100%) diff --git a/snapcraft/Makefile.am b/snapcraft/Makefile.am index d32e18d071..8cc4e0b4c6 100644 --- a/snapcraft/Makefile.am +++ b/snapcraft/Makefile.am @@ -2,4 +2,4 @@ EXTRA_DIST = snapcraft.yaml \ README.* \ scripts/Makefile scripts/*-service \ defaults/*.conf.default \ - helpers setup + helpers snap diff --git a/snapcraft/setup/gui/icon.png b/snapcraft/snap/gui/icon.png similarity index 100% rename from snapcraft/setup/gui/icon.png rename to snapcraft/snap/gui/icon.png