Merge lp:~ken-vandine/camera-app/content-hub_and_add-profile into lp:camera-app

Proposed by Ken VanDine on 2016-12-14
Status: Merged
Approved by: Bill Filler on 2016-12-19
Approved revision: 677
Merged at revision: 679
Proposed branch: lp:~ken-vandine/camera-app/content-hub_and_add-profile
Merge into: lp:camera-app
Diff against target: 68 lines (+22/-0)
5 files modified
CMakeLists.txt (+3/-0)
debian/apparmor/camera-app (+15/-0)
debian/camera-app.install (+2/-0)
debian/control (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/camera-app/content-hub_and_add-profile
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve on 2016-12-14
Ubuntu Phablet Team 2016-12-14 Pending
Review via email: mp+313232@code.launchpad.net

Commit message

* Install an apparmor profile with the deb
* Install the content-hub peer registration with the deb

Description of the change

* Install an apparmor profile with the deb
* Install the content-hub peer registration with the deb

To post a comment you must log in.

PASSED: Continuous integration, rev:677
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/8/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2192
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/565
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2195
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2022/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2022/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2022/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2022/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2022/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2022/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2022/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2022/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2022
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2022/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/8/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-11-18 06:44:35 +0000
3+++ CMakeLists.txt 2016-12-14 15:08:09 +0000
4@@ -136,6 +136,9 @@
5 else(CLICK_MODE)
6 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
7 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
8+ install(FILES camera-contenthub.json
9+ DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers
10+ RENAME camera-app)
11 endif(CLICK_MODE)
12
13 add_subdirectory(CameraApp)
14
15=== added directory 'debian/apparmor'
16=== added file 'debian/apparmor/camera-app'
17--- debian/apparmor/camera-app 1970-01-01 00:00:00 +0000
18+++ debian/apparmor/camera-app 2016-12-14 15:08:09 +0000
19@@ -0,0 +1,15 @@
20+# vim:syntax=apparmor
21+#include <tunables/global>
22+
23+# Mostly unconfined. Don't allow capability or any mount rules. Also ensure that
24+# exec inherits from this profile
25+profile camera-app (attach_disconnected) {
26+ network,
27+ / rwkl,
28+ /** rwlkm,
29+ /** pix,
30+ dbus,
31+ signal,
32+ ptrace,
33+ unix,
34+}
35
36=== modified file 'debian/camera-app.install'
37--- debian/camera-app.install 2014-09-01 11:30:28 +0000
38+++ debian/camera-app.install 2016-12-14 15:08:09 +0000
39@@ -6,3 +6,5 @@
40 usr/share/camera-app/assets/*
41 usr/share/icons
42 usr/share/locale/*/LC_MESSAGES/camera-app.mo
43+usr/share/content-hub
44+debian/apparmor/camera-app etc/apparmor.d
45
46=== modified file 'debian/control'
47--- debian/control 2016-11-24 19:03:33 +0000
48+++ debian/control 2016-12-14 15:08:09 +0000
49@@ -5,6 +5,7 @@
50 XSBC-Original-Maintainer: Ugo Riboni <ugo.riboni@canonical.com>
51 Build-Depends: cmake,
52 debhelper (>= 9),
53+ dh-apparmor,
54 libgl1-mesa-dev | libgl1-dev,
55 libgles2-mesa-dev | libgles2-dev,
56 pkg-config,
57
58=== modified file 'debian/rules'
59--- debian/rules 2016-08-23 09:40:44 +0000
60+++ debian/rules 2016-12-14 15:08:09 +0000
61@@ -23,6 +23,7 @@
62
63 override_dh_install:
64 dh_install --fail-missing
65+ dh_apparmor -pcamera-app --profile-name=camera-app
66
67 override_dh_translations:
68 # Override dh_translations to work around http://pad.lv/1183262.

Subscribers

People subscribed via source and target branches