diff options
| author | juho <juho80.son@samsung.com> | 2013-05-10 17:46:26 +0900 |
|---|---|---|
| committer | juho <juho80.son@samsung.com> | 2013-05-10 17:46:26 +0900 |
| commit | 3b1d607cc4d95f167a83385112944d4518b57cad (patch) | |
| tree | d550ab7a04828bb26165c14af6283b6ce5f54b23 | |
| parent | 2e0304fc9d0fc165429ada6f415086a27dfc3285 (diff) | |
| parent | a2834f29681a771ff23f631e0fc38892314a4e8a (diff) | |
| download | crash-worker-sdk-3b1d607cc4d95f167a83385112944d4518b57cad.tar.gz crash-worker-sdk-3b1d607cc4d95f167a83385112944d4518b57cad.tar.bz2 crash-worker-sdk-3b1d607cc4d95f167a83385112944d4518b57cad.zip | |
Merge branch 'tizen_2.1_smack' into tizen_2.1submit/tizen_2.1/20130514.052157
| -rw-r--r-- | crash-popup/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/crash-worker-sdk.manifest | 9 | ||||
| -rw-r--r-- | packaging/crash-worker-sdk.spec | 2 | ||||
| -rw-r--r-- | packaging/org.tizen.crash-popup.rule | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/crash-popup/CMakeLists.txt b/crash-popup/CMakeLists.txt index 3c2532b..f3e9245 100644 --- a/crash-popup/CMakeLists.txt +++ b/crash-popup/CMakeLists.txt @@ -93,7 +93,7 @@ INSTALL(TARGETS ${EXENAME} DESTINATION ${BINDIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PKGNAME}.xml DESTINATION ${PREFIX}/share/packages) INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PKGNAME}.png DESTINATION ${ICONDIR}) # install SMACK rule file -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.crash-popup.rule DESTINATION /etc/smack/accesses2.d) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.crash-popup.rule DESTINATION /opt/etc/smack/accesses.d/) # i18n ADD_SUBDIRECTORY(popup_po) diff --git a/packaging/crash-worker-sdk.manifest b/packaging/crash-worker-sdk.manifest index 1c58b9f..d231ec6 100644 --- a/packaging/crash-worker-sdk.manifest +++ b/packaging/crash-worker-sdk.manifest @@ -10,14 +10,23 @@ <smack request="system::media" type="rwxat" /> <smack request="system::share" type="rwxat" /> <smack request="system::use_internet" type="rw" /> + <smack request="xorg" type="rw" /> <smack request="ail::db" type="rw" /> <smack request="dbus" type="rwx" /> </request> + <permit> + <smack permit="system::use_internet" type="rwx"/> + </permit> </define> <request> <domain name="crash-worker"/> </request> <assign> <filesystem path="/usr/bin/all_log_dump.sh" label="_" exec_label="none"/> + <filesystem path="/opt/usr/share/crash" label="sys-assert::core" exec_label="none"/> + <filesystem path="/opt/usr/share/crash/report" label="sys-assert::core" exec_label="none"/> + <filesystem path="/opt/usr/share/crash/core" label="sys-assert::core" exec_label="none"/> + <filesystem path="/opt/usr/share/crash/dump" label="sys-assert::core" exec_label="none"/> + <filesystem path="/opt/usr/share/crash/ticket" label="sys-assert::core" exec_label="none"/> </assign> </manifest> diff --git a/packaging/crash-worker-sdk.spec b/packaging/crash-worker-sdk.spec index e2a5208..54458bb 100644 --- a/packaging/crash-worker-sdk.spec +++ b/packaging/crash-worker-sdk.spec @@ -105,7 +105,7 @@ vconftool set -t int db/crash/sendflag "0" -f %files -n org.tizen.crash-popup %manifest org.tizen.crash-popup.manifest -/etc/smack/accesses2.d/org.tizen.crash-popup.rule +/opt/etc/smack/accesses.d/org.tizen.crash-popup.rule %defattr(-,root,root,-) /usr/share/packages/org.tizen.crash-popup.xml /usr/share/icons/default/small/org.tizen.crash-popup.png diff --git a/packaging/org.tizen.crash-popup.rule b/packaging/org.tizen.crash-popup.rule index 5d83f2c..c034412 100644 --- a/packaging/org.tizen.crash-popup.rule +++ b/packaging/org.tizen.crash-popup.rule @@ -9,10 +9,10 @@ org.tizen.crash-popup dali rwxat e17 org.tizen.crash-popup w org.tizen.crash-popup ail::db rw org.tizen.crash-popup system::use_internet r -org.tizen.crash-popup xorg w +org.tizen.crash-popup xorg rw org.tizen.crash-popup isf rwx org.tizen.crash-popup org.tizen.indicator rw org.tizen.crash-popup sound_server rw org.tizen.crash-popup dbus r -org.tizen.crash-viewer pulseaudio rwxat +org.tizen.crash-popup pulseaudio rwxat org.tizen.crash-popup stest-service w |