snapweb

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

  1. use-snapcraft-to-snap
  2. Merge into 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
1=== modified file 'build.sh'
2--- build.sh 2016-03-22 09:50:56 +0000
3+++ build.sh 2016-04-27 07:36:44 +0000
4@@ -74,4 +74,4 @@
5
6 cd "$orig_pwd"
7
8-snappy build $builddir
9+snapcraft snap $builddir
10
11=== modified file 'pkg/meta/snap.yaml'
12--- pkg/meta/snap.yaml 2016-04-25 05:14:26 +0000
13+++ pkg/meta/snap.yaml 2016-04-27 07:36:44 +0000
14@@ -9,16 +9,10 @@
15 - manage updates to the system.
16 - control the state of other snappy packages.
17 - browse the store to install new snappy packages.
18-icon: meta/webdm-icon.png
19+icon: meta/gui/icon.png
20 source: lp:webdm
21 type: app
22 architecture: UNKNOWN_ARCH
23-services:
24- ports:
25- external:
26- ui:
27- port: 4200/tcp
28- negotiable: false
29 apps:
30 snappyd:
31 daemon: simple
32
33=== added file 'snapcraft.yaml'

Subscribers

People subscribed via source and target branches