Import patches-unapplied version 2.398 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: fa7136ad4df28fd74f804335797079a2084efc37

New changelog entries:
  * switch snappy package builds from "snappy build" to "snapcraft snap"
  (LP: #1557515)
This commit is contained in:
Oliver Grawert 2016-04-08 16:45:48 +02:00 committed by usd-importer
parent fa7136ad4d
commit 01521cefe4
2 changed files with 11 additions and 4 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.398) xenial; 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:

View File

@ -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