Merge lp:~stevenwilkin/snapweb/use-snapcraft-to-snap into lp:~snappy-dev/snapweb/trunk

Proposed by Steven Wilkin
Status: Merged
Approved by: Steven Wilkin
Approved revision: 183
Merge reported by: Steven Wilkin
Merged at revision: not available
Proposed branch: lp:~stevenwilkin/snapweb/use-snapcraft-to-snap
Merge into: lp:~snappy-dev/snapweb/trunk
Diff against target: 33 lines (+2/-8)
2 files modified
build.sh (+1/-1)
pkg/meta/snap.yaml (+1/-7)
To merge this branch: bzr merge lp:~stevenwilkin/snapweb/use-snapcraft-to-snap
Reviewer Review Type Date Requested Status
Zygmunt Krynicki Approve
Review via email: mp+293053@code.launchpad.net

Commit message

Use `snapcraft snap` to package snap

Description of the change

Use `snapcraft snap` to package snap.

Solves AppArmor problem with launching WebDM from the generated snap.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1 :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build.sh'
--- build.sh 2016-03-22 09:50:56 +0000
+++ build.sh 2016-04-27 07:36:44 +0000
@@ -74,4 +74,4 @@
7474
75cd "$orig_pwd"75cd "$orig_pwd"
7676
77snappy build $builddir77snapcraft snap $builddir
7878
=== modified file 'pkg/meta/snap.yaml'
--- pkg/meta/snap.yaml 2016-04-25 05:14:26 +0000
+++ pkg/meta/snap.yaml 2016-04-27 07:36:44 +0000
@@ -9,16 +9,10 @@
9 - manage updates to the system.9 - manage updates to the system.
10 - control the state of other snappy packages.10 - control the state of other snappy packages.
11 - browse the store to install new snappy packages.11 - browse the store to install new snappy packages.
12icon: meta/webdm-icon.png12icon: meta/gui/icon.png
13source: lp:webdm13source: lp:webdm
14type: app14type: app
15architecture: UNKNOWN_ARCH15architecture: UNKNOWN_ARCH
16services:
17 ports:
18 external:
19 ui:
20 port: 4200/tcp
21 negotiable: false
22apps:16apps:
23 snappyd:17 snappyd:
24 daemon: simple18 daemon: simple
2519
=== added file 'snapcraft.yaml'

Subscribers

People subscribed via source and target branches