From e7723219a31ccfa85cc029cbe796726ec8166f92 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 8 Apr 2016 16:52:42 +0200
Subject: [PATCH] switch snappy package builds from "snappy build" to
 "snapcraft snap" (LP: #1557515)

---
 debian/changelog      | 7 +++++++
 live-build/auto/build | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5d59913..606b6a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.398) UNRELEASED; urgency=medium
+
+  * switch snappy package builds from "snappy build" to "snapcraft snap"
+  (LP: #1557515)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 08 Apr 2016 16:45:48 +0200
+
 livecd-rootfs (2.397) xenial; urgency=medium
 
   * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
diff --git a/live-build/auto/build b/live-build/auto/build
index f25062d9..1e619edb 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -337,8 +337,8 @@ architectures: [$ARCH]
 type: os
 EOF
 
-        apt-get -y install ubuntu-snappy-cli
-        snappy build --squashfs $rootfs
+        apt-get -y install snapcraft
+        snapcraft snap $rootfs
 
         snapfile="$(ls ubuntu-core*.snap)"
         cp -a $snapfile $PREFIX.os.snap
@@ -577,8 +577,8 @@ EOF
         fi
         cd $HERE
 
-        apt-get -y install ubuntu-snappy-cli
-        snappy build --squashfs snap
+        apt-get -y install snapcraft
+        snapcraft snap snap
 
         snapfile="$(ls $metaname*.snap)"
         cp -a $snapfile $PREFIX.$snapname