Mir Kiosk

Merge ~saviq/mir-kiosk:no-overlay into ~mir-team/mir-kiosk/+git/mir-kiosk-old:master

  1. Git
  2. lp:~saviq/mir-kiosk
  3. no-overlay
  4. Merge into master
Proposed by Michał Sawicz
Status: Merged
Approved by: Michał Sawicz
Approved revision: d2681fa90c9e04a149fda4c4bc7cecff2aeb6aab
Merged at revision: d2681fa90c9e04a149fda4c4bc7cecff2aeb6aab
Proposed branch: ~saviq/mir-kiosk:no-overlay
Merge into: ~mir-team/mir-kiosk/+git/mir-kiosk-old:master
Diff against target: 48 lines (+26/-5)
1 file modified
snap/snapcraft.yaml (+26/-5)
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Alberto Aguirre (community) Approve
Review via email: mp+324180@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

LGTM. Builds in a clean container with xenial-proposed.

review: Approve
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Worked with in a AMD64 VM ubuntu core image

Revision history for this message
Alberto Aguirre (albaguirre) wrote :

The snap version should probably be changed to "1.3.2" to match the lp:miral/release branch version.

Revision history for this message
Michał Sawicz (saviq) wrote :

> The snap version should probably be changed to "1.3.2" to match the lp:miral/release branch version.
Done

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index abff93d..7fa9032 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
1name: mir-kiosk1name: mir-kiosk
2version: 1.2.0 #The miral-examples version2version: 1.2.3 # The miral release version
3summary: A minimal Mir based shell for kiosk type applications3summary: A minimal Mir based shell for kiosk type applications
4description: A minimal Mir based shell for kiosk type applications4description: A minimal Mir based shell for kiosk type applications
5confinement: strict5confinement: strict
@@ -23,11 +23,32 @@ apps:
2323
24parts:24parts:
25 miral-examples:25 miral-examples:
26 plugin: nil26 plugin: cmake
27 stage-packages:27 source: lp:miral/release
28 - miral-examples28 configflags:
29 - -DCMAKE_INSTALL_PREFIX=/usr
29 build-attributes:30 build-attributes:
30 - no-system-libraries31 - no-system-libraries
32 build-packages:
33 - build-essential
34 - libfreetype6-dev
35 - libgles2-mesa-dev
36 - libglib2.0-dev
37 - libmirserver-dev
38 - libmirclient-dev
39 - pkg-config
40 - python-pil
41 stage-packages:
42 - libboost-filesystem1.58.0
43 - libboost-program-options1.58.0
44 - libboost-system1.58.0
45 - libegl1-mesa
46 - libfreetype6
47 - libgles2-mesa
48 - libglib2.0-0
49 - libnettle6
50 - libprotobuf-lite9v5
51 - libxkbcommon0
31 prime:52 prime:
32 - usr/lib53 - usr/lib
33 - -usr/lib/*/libmir* #Use the libraries from mir-libs content plug54 - -usr/lib/*/libmir* #Use the libraries from mir-libs content plug

Subscribers

People subscribed via source and target branches