messaging-app

Merge lp:~phablet-team/messaging-app/23-add-dri-rules-to-apparmor into lp:messaging-app/staging

  1. 23-add-dri-rules-to-apparmor
  2. Merge into staging
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 641
Merged at revision: 662
Proposed branch: lp:~phablet-team/messaging-app/23-add-dri-rules-to-apparmor
Merge into: lp:messaging-app/staging
Prerequisite: lp:~phablet-team/messaging-app/delay_filling_participants
Diff against target: 17 lines (+6/-1)
1 file modified
debian/rules (+6/-1)
To merge this branch: bzr merge lp:~phablet-team/messaging-app/23-add-dri-rules-to-apparmor
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
Review via email: mp+320404@code.launchpad.net

Commit message

Add apparmor rules to access dri.

Description of the change

Add apparmor rules to access dri.

To post a comment you must log in.
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2016-07-29 23:26:31 +0000
3+++ debian/rules 2017-03-20 17:33:45 +0000
4@@ -26,7 +26,12 @@
5 sed 's,Apps/@{APP_PKGNAME},Apps/messaging-app,g' | \
6 sed '/lttng-ust-/c\ \/{,var\/}run\/shm\/lttng-ust-* r,' | \
7 sed '/dconf.user rw/c\ \/run\/user\/\[0-9\]*\/dconf\/user rw,' | \
8- sed 's,deny owner .*dconf/user r,owner @\{HOME\}/.config/dconf/user r,g' \
9+ sed 's,deny owner .*dconf/user r,owner @\{HOME\}/.config/dconf/user r,g' | \
10+ egrep -v 'deny /run/udev/data/\*\* r,' | \
11+ sed 's#^}$$#\n /sys/class/ r,\n /sys/class/input/ r,\n /run/udev/data/** r,\n}#g' | \
12+ egrep -v '^\s*deny /dev/ r,\s*$$' | \
13+ sed 's#^\(\s*\)deny\(\s\+/{run,dev}/shm/pulse-shm\*\s\+w,\).*$$#\1owner\2#g' | \
14+ sed 's#^}$$#\n /dev/dri/ r,\n /sys/devices/pci[0-9]*/**/config r,\n}#g' \
15 > ./debian/usr.bin.messaging-app
16 (head -n -2 ./debian/usr.bin.messaging-app; cat ./debian/messaging-app-apparmor.additions; \
17 echo } ) > ./debian/usr.bin.messaging-app2

Subscribers

People subscribed via source and target branches

to all changes: