diff options
| author | minsoo kim <ms203.kim@samsung.com> | 2017-05-26 18:58:35 +0900 |
|---|---|---|
| committer | Sunmin Lee <sunm.lee@samsung.com> | 2017-06-19 11:00:16 +0900 |
| commit | 1bb5a2c03b25f07607f6d134ba2de0578d290b00 (patch) | |
| tree | d8ac7ac5473b53ccdb4eb0fad39fe81caf8a9445 | |
| parent | 4aa86bb737afd482172fe73c113e5339d2013be1 (diff) | |
| download | crash-worker-1bb5a2c03b25f07607f6d134ba2de0578d290b00.tar.gz crash-worker-1bb5a2c03b25f07607f6d134ba2de0578d290b00.tar.bz2 crash-worker-1bb5a2c03b25f07607f6d134ba2de0578d290b00.zip | |
log_dump: selective mode for dbus activation
log_dump running root in debug mode, and none_root with normal mode.
Simplify org.tizen.system.crash.service conditional compile by using m4
Change-Id: I04b734f722266264434b27e9fe7b17cdc73263f1
Signed-off-by: minsoo kim <ms203.kim@samsung.com>
Signed-off-by: Sunmin Lee <sunm.lee@samsung.com>
| -rw-r--r-- | cmake/ProcessM4.cmake | 11 | ||||
| -rw-r--r-- | packaging/crash-worker.spec | 5 | ||||
| -rw-r--r-- | src/log_dump/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/log_dump/org.tizen.system.crash.service.m4 (renamed from src/log_dump/org.tizen.system.crash.service) | 6 |
4 files changed, 29 insertions, 3 deletions
diff --git a/cmake/ProcessM4.cmake b/cmake/ProcessM4.cmake new file mode 100644 index 0000000..09ba1c9 --- /dev/null +++ b/cmake/ProcessM4.cmake @@ -0,0 +1,11 @@ +MACRO(PROCESS_M4 _defines _input _output) + GET_FILENAME_COMPONENT(_name ${_output} NAME) + ADD_CUSTOM_COMMAND( + OUTPUT ${_output} + COMMAND m4 + ARGS -P ${_defines} ${_input} > ${_output} + DEPENDS ${_input} + VERBATIM) + ADD_CUSTOM_TARGET(M4_${_name} DEPENDS ${_output}) + ADD_DEPENDENCIES(${PROJECT_NAME} M4_${_name}) +ENDMACRO(PROCESS_M4) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 5fff375..a140193 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -10,8 +10,8 @@ Name: crash-worker Summary: Crash-manager -Version: 1.0.0 -Release: 2 +Version: 1.0.1 +Release: 3 Group: Framework/system License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@ -85,6 +85,7 @@ This package contains installable tests in Bash. cp %{SOURCE1001} . export CFLAGS+=" -Werror" +export CFLAGS+=" -DTIZEN_DEBUG_MODE" %ifarch %{arm} aarch64 %define ARCH arm diff --git a/src/log_dump/CMakeLists.txt b/src/log_dump/CMakeLists.txt index 20202b6..e205994 100644 --- a/src/log_dump/CMakeLists.txt +++ b/src/log_dump/CMakeLists.txt @@ -16,16 +16,26 @@ pkg_check_modules(log_dump_pkgs REQUIRED gio-2.0 ) +INCLUDE(${CMAKE_SOURCE_DIR}/cmake/ProcessM4.cmake) + FOREACH(flag ${log_dump_pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_DEBUG_MODE") + SET(M4_DEFINES ${M4_DEFINES} -DUSE_DEBUG_MODE) +ENDIF() + CONFIGURE_FILE(log_dump.h.in log_dump.h @ONLY) ADD_EXECUTABLE(${PROJECT_NAME} ${LOG_DUMP_SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${log_dump_pkgs_LDFLAGS} -pie) +PROCESS_M4("${M4_DEFINES}" + "${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.system.crash.service.m4" + "${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.system.crash.service") + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.system.crash.service DESTINATION /usr/share/dbus-1/system-services) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/log_dump.conf diff --git a/src/log_dump/org.tizen.system.crash.service b/src/log_dump/org.tizen.system.crash.service.m4 index 1e9a605..58ea606 100644 --- a/src/log_dump/org.tizen.system.crash.service +++ b/src/log_dump/org.tizen.system.crash.service.m4 @@ -1,5 +1,9 @@ [D-BUS Service] Name=org.tizen.system.crash Exec=/usr/bin/log_dump --dbus +m4_ifdef(`USE_DEBUG_MODE', User=root -Group=root +Group=root, +User=system_fw +Group=system_share +) |