Merge lp:~osomon/webbrowser-app/mir-libs into lp:webbrowser-app/staging

Proposed by Olivier Tilloy on 2017-03-28
Status: Merged
Merged at revision: 1641
Proposed branch: lp:~osomon/webbrowser-app/mir-libs
Merge into: lp:webbrowser-app/staging
Diff against target: 24 lines (+6/-0)
1 file modified
snap/snapcraft.yaml (+6/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/mir-libs
Reviewer Review Type Date Requested Status
Michael Terry 2017-03-28 Approve on 2017-03-28
Ubuntu Phablet Team 2017-03-28 Pending
Review via email: mp+321151@code.launchpad.net

Commit message

Add mir-libs content plug.

To post a comment you must log in.
Michael Terry (mterry) wrote :

+ - mir-libs

I don't believe you need this line? But I'm not an expert and even if you don't need it, I think it's harmless, so fine.

(the global plug list applies its plugs to all your commands already)

+ default-provider: mir-libs:mir-libs

It's hard to say because this line isn't used by snapd at all yet, but I think you just need "mir-libs" here. c.f. the ubuntu-app-platform stanza below this one.

lp:~osomon/webbrowser-app/mir-libs updated on 2017-03-28
1640. By Olivier Tilloy on 2017-03-28

Non-qualified default provider name.

Olivier Tilloy (osomon) wrote :

> I don't believe you need this line? But I'm not an expert and even
> if you don't need it, I think it's harmless, so fine.

I’m not sure either, but I’ll keep it for the sake of consistency with how we’re plugging to the platform snap.

> It's hard to say because this line isn't used by snapd at all yet, but
> I think you just need "mir-libs" here. c.f. the ubuntu-app-platform
> stanza below this one.

You’re probably right. I had just blindly copied what’s in https://bazaar.launchpad.net/~alan-griffiths/mircade-snap/trunk/view/head:/snap/snapcraft.yaml. I guess we’ll find out the day snapd starts making use of that line. I applied your suggestion.

Michael Terry (mterry) wrote :

Looks good to me! :) Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'snap/mir-libs'
2=== modified file 'snap/snapcraft.yaml'
3--- snap/snapcraft.yaml 2017-03-17 17:30:56 +0000
4+++ snap/snapcraft.yaml 2017-03-28 14:03:22 +0000
5@@ -12,6 +12,7 @@
6 - browser-sandbox
7 - camera
8 - mir
9+ - mir-libs
10 - network
11 - network-bind
12 - opengl
13@@ -25,6 +26,11 @@
14 browser-sandbox:
15 interface: browser-support
16 allow-sandbox: true
17+ mir-libs:
18+ content: mir0
19+ default-provider: mir-libs
20+ interface: content
21+ target: mir-libs
22 platform:
23 content: ubuntu-app-platform1
24 default-provider: ubuntu-app-platform

Subscribers

People subscribed via source and target branches