Merge lp:~kalikiana/ubuntu-sdk-ide/lxdfixes into lp:ubuntu-sdk-ide

Proposed by Cris Dywan
Status: Needs review
Proposed branch: lp:~kalikiana/ubuntu-sdk-ide/lxdfixes
Merge into: lp:ubuntu-sdk-ide
Diff against target: 67 lines (+31/-4)
3 files modified
dpkg (+2/-0)
pkexec (+3/-0)
snapcraft.yaml (+26/-4)
To merge this branch: bzr merge lp:~kalikiana/ubuntu-sdk-ide/lxdfixes
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+313436@code.launchpad.net

Commit message

Add dpkg and pkexec drop-in fake replacements

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Unmerged revisions

169. By Cris Dywan

Add dpkg and pkexec drop-in fake replacements

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'dpkg'
2--- dpkg 1970-01-01 00:00:00 +0000
3+++ dpkg 2016-12-16 14:39:46 +0000
4@@ -0,0 +1,2 @@
5+#!/bin/sh
6+echo $SNAP_ARCH
7
8=== added file 'pkexec'
9--- pkexec 1970-01-01 00:00:00 +0000
10+++ pkexec 2016-12-16 14:39:46 +0000
11@@ -0,0 +1,3 @@
12+#!/bin/sh
13+echo Ignoring super-user priviledges: $*
14+exec $*
15
16=== modified file 'snapcraft.yaml'
17--- snapcraft.yaml 2016-09-07 08:55:57 +0000
18+++ snapcraft.yaml 2016-12-16 14:39:46 +0000
19@@ -1,5 +1,5 @@
20 name: ubuntu-sdk-ide
21-version: "0"
22+version: "4.1"
23 summary: Integrated Development Environment for Ubuntu Touch
24 description: |
25 Qt Creator is a lightweight, cross-platform integrated development environment (IDE) designed to make
26@@ -7,12 +7,13 @@
27
28 This package contains the Qt Creator and the Ubuntu plugins providing deeper integration for developing
29 applications for Ubuntu using the Ubuntu UI Toolkit. It also introduces an Ubuntu themed welcome screen.
30-confinement: devmode
31+confinement: strict
32+grade: devel
33
34 apps:
35 ubuntu-sdk-ide:
36- command: desktop-launch $SNAP/usr/ubuntu-sdk-ide/bin/qtcreator.sh -noload Ubuntu
37- plugs: [unity7, opengl, network-bind]
38+ command: desktop-launch $SNAP/usr/ubuntu-sdk-ide/bin/qtcreator.sh
39+ plugs: [unity7, opengl, pulseaudio, network-bind, network, home, removable-media, lxd]
40
41 parts:
42 ubuntu-sdk-ide:
43@@ -21,3 +22,24 @@
44 - ubuntu-sdk-ide
45 # https://wiki.ubuntu.com/snapcraft/parts
46 after: [desktop-glib-only]
47+ organize:
48+ usr/bin/usdk-target: usr/bin/usdk-target.upstream
49+ usdk-target:
50+ source: lp:~kalikiana/ubuntu-sdk-tools/lxd-snap
51+ plugin: go
52+ go-importpath: launchpad.net/ubuntu-sdk-tools
53+ go-packages:
54+ - launchpad.net/ubuntu-sdk-tools/usdk-target
55+ build-packages: [bzr, gcc]
56+ after: [ubuntu-sdk-ide]
57+ # Drop-in fake replacements for tools that don't exist in core
58+ stubs:
59+ plugin: dump
60+ source: .
61+ after: [ubuntu-sdk-ide]
62+ organize:
63+ dpkg: bin/dpkg
64+ pkexec: bin/pkexec
65+ snap:
66+ - bin
67+

Subscribers

People subscribed via source and target branches

to all changes: