Merge lp:~zyga/livecd-rootfs/base-snap into lp:livecd-rootfs

[Zygmunt Krynicki]

This branch begins the rename of the "ubuntu-core" snap to "base" snap. For now both snaps are built, with identical contents. Over time the older name will go away.

[lp:~zyga/livecd-rootfs/base-snap]

1392. By Zygmunt Krynicki on 2016-05-25

Build base snap alongside the existing ubuntu-core snap. Both snaps have
the same content, the only difference is in the name (base) and summary.

[lp:~zyga/livecd-rootfs/base-snap]

1393. By Zygmunt Krynicki on 2016-05-25

Fix missing snapcraft call, thanks to mvo

[Oliver Grawert (ogra)]

Looks good

review: Approve

[Oliver Grawert (ogra)]

Note that cdimage will also need a change to learn about the new "file type" before we can have them supported proper

[Zygmunt Krynicki (zyga)]

Ogra, where do I have to make the change?

[Steve Langasek (vorlon)]

there has been internal feedback to call this snap 'core' instead of either 'ubuntu-core' or 'base'.

review: Needs Fixing

[Steve Langasek (vorlon)]

Is there actually a reason to continue building the old snap name? I would prefer to see this replace the old one wholesale. The old name will still exist in the store and we can transition the tooling to use the new name fairly quickly.

[Oliver Grawert (ogra)]

No, there isn't really, we should just change the name in the meta data and do all the rest on the store side, when I'm back tomorrow I'll take care of this

[Zygmunt Krynicki (zyga)]

We want to publish both snaps for a while. We're not sure when the switch will happen in snapd and in any case it would be easier if we can rely on this.

Ideally this would be a name change (if we had snap id's) but it is a very tricky thing to do.

[Zygmunt Krynicki (zyga)]

Steve: I was asked to go ahead with the name "base".

[Zygmunt Krynicki (zyga)]

Please disregard my last comment.

Unmerged revisions

1393. By Zygmunt Krynicki on 2016-05-25

Fix missing snapcraft call, thanks to mvo

1392. By Zygmunt Krynicki on 2016-05-25

Build base snap alongside the existing ubuntu-core snap. Both snaps have
the same content, the only difference is in the name (base) and summary.

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-25 12:30:39 +0000
+++ debian/changelog	2016-05-25 19:59:55 +0000
@@ -12,7 +12,11 @@
   * adjust motd message on snappy (capitalize "Snappy Ubuntu Core" and replace
     the "snappy --help" with "snap --help"
 
- -- Oliver Grawert <[e-mail]>  Wed, 25 May 2016 14:26:07 +0200
+  [ Zygmunt Krynicki ]
+  * Build base snap alongside the existing ubuntu-core snap. Both snaps have
+    the same content, the only difference is in the name (base) and summary.
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 25 May 2016 20:09:18 +0200
 
 livecd-rootfs (2.410) yakkety; urgency=medium
 

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2016-05-11 01:18:06 +0000
+++ live-build/auto/build	2016-05-25 19:59:55 +0000
@@ -342,6 +342,17 @@
 
         snapfile="$(ls ubuntu-core*.snap)"
         cp -a $snapfile $PREFIX.os.snap
+        # Build the new variant (base) of the same snap too.
+        cat > $rootfs/meta/snap.yaml <<EOF
+name: base
+version: $VERSION
+summary: Base content for snapd
+architectures: [$ARCH]
+type: os
+EOF
+        snapcraft snap $rootfs
+        snapfile="$(ls base*.snap)"
+        cp -a $snapfile $PREFIX.base.snap
     fi
 fi