Move hardcoded paths back to .spec file

Change-Id: I50a83ba1a19088608200f1ef9ce83649cc53af68

diff --git a/include/defs.h.in b/include/defs.h.in
index 04dbf06..f2f064c 100644 (file)
--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -5,9 +5,13 @@
 #define CRASH_ROOT_PATH                        "@CRASH_ROOT_PATH@"
 #define CRASH_TEMP                     "@CRASH_TEMP@"
 #define SYS_ASSERT                     "@SYS_ASSERT@"
-#define CRASH_STACK_PATH               "@CRASH_STACK_PATH@"
+#define CRASH_STACK_BIN_PATH           "@CRASH_STACK_BIN_PATH@"
+#define CRASH_POPUP_BIN_PATH           "@CRASH_POPUP_BIN_PATH@"
+#define CRASH_NOTIFY_BIN_PATH          "@CRASH_NOITFY_BIN_PATH@"
+#define LOG_DUMP_BIN_PATH              "@LOG_DUMP_BIN_PATH@"
+#define DUMP_SYSTEMSTATE_BIN_PATH      "@DUMP_SYSTEMSTATE_BIN_PATH@"
+#define DUMP_SYSTEMSTATE_CONFIG_DIR_PATH "@DUMP_SYSTEMSTATE_CONFIG_DIR_PATH@"
 #define CRASH_MANAGER_CONFIG_PATH      "@CRASH_MANAGER_CONFIG_PATH@"
-#define DUMP_SYSTEMSTATE_CONFIG_DIR_PATH               "@DUMP_SYSTEMSTATE_CONFIG_DIR_PATH@"
 #define MINICOREDUMPER_BIN_PATH                "@MINICOREDUMPER_BIN_PATH@"
 #define MINICOREDUMPER_CONFIG_PATH     "@MINICOREDUMPER_CONFIG_PATH@"
 #define DEBUGMODE_PATH                 "@DEBUGMODE_PATH@"

diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec
index aae948e..a1ff648 100644 (file)
--- a/packaging/crash-worker.spec
+++ b/packaging/crash-worker.spec
@@ -126,7 +126,11 @@ export CFLAGS+=" -Werror"
           -DMINICOREDUMPER_BIN_PATH=%{_sbindir}/minicoredumper \
           -DMINICOREDUMPER_CONFIG_PATH=%{_sysconfdir}/minicoredumper/minicoredumper.cfg.json \
           -DLIVEDUMPER_BIN_PATH=%{_bindir}/livedumper \
-          -DCRASH_STACK_PATH=%{_libexecdir}/crash-stack \
+          -DLOG_DUMP_BIN_PATH=%{_bindir}/log_dump \
+          -DDUMP_SYSTEMSTATE_BIN_PATH=%{_bindir}/dump_systemstate \
+          -DCRASH_STACK_BIN_PATH=%{_libexecdir}/crash-stack \
+          -DCRASH_POPUP_BIN_PATH=%{_libexecdir}/crash-popup-launch \
+          -DCRASH_NOTIFY_BIN_PATH=%{_libexecdir}/crash-notify-send \
           -DCRASH_TESTS_PATH=%{_libdir}/crash-worker-tests \
           -DSYS_ASSERT=%{on_off sys_assert} \
           -DLOG_DUMP=%{on_off logdump} \

diff --git a/src/crash-manager/crash-manager.c b/src/crash-manager/crash-manager.c
index c87db05..64f538e 100644 (file)
--- a/src/crash-manager/crash-manager.c
+++ b/src/crash-manager/crash-manager.c
@@ -594,7 +594,7 @@ static void launch_crash_popup(struct crash_info *cinfo)
 {
        assert(cinfo);
 
-       char *av[] = { "/usr/libexec/crash-popup-launch",
+       char *av[] = { CRASH_POPUP_BIN_PATH,
                        "--cmdline", cinfo->cmd_line,
                        "--cmdpath", cinfo->cmd_path,
                        NULL };
@@ -605,7 +605,7 @@ static void launch_crash_popup(struct crash_info *cinfo)
 
 static bool dump_system_state(const struct crash_info *cinfo, pid_t *pid)
 {
-       char *av[] = {"/usr/bin/dump_systemstate", "-d", "-k", "-j", "-p", "-e", "-f",  cinfo->log_path, NULL};
+       char *av[] = {DUMP_SYSTEMSTATE_BIN_PATH, "-d", "-k", "-j", "-p", "-e", "-f",  cinfo->log_path, NULL};
        spawn_param_s param = { .fn = spawn_setstdout, .u.int_val = STDERR_FILENO };
        return spawn(av, NULL, &param, pid, NULL);
 }
@@ -674,7 +674,7 @@ static void launch_dbus_notify(struct crash_info *cinfo)
        SNPRINTF_OR_EXIT(pid, "%d")
        SNPRINTF_OR_EXIT(tid, "%d")
 
-       char *av[] = { "/usr/libexec/crash-notify-send",
+       char *av[] = { CRASH_NOTIFY_BIN_PATH,
                        "--cmdline", cinfo->cmd_line,
                        "--cmdpath", cinfo->cmd_path,
                        "--pid", pid_str,
@@ -794,18 +794,12 @@ static bool execute_crash_stack(const struct crash_info *cinfo, int *exit_code)
        SNPRINTF_OR_EXIT_W(prstatus_fd, "%d", prstatus_fd)
 
        /* Execute crash-stack */
-       char *args[] = {
-                       CRASH_STACK_PATH,
-                       "--pid",
-                       pid_str,
-                       "--tid",
-                       tid_str,
-                       "--sig",
-                       sig_str,
-                       "--prstatus_fd",
-                       prstatus_fd_str,
-                       NULL
-       };
+       char *args[] = { CRASH_STACK_BIN_PATH,
+                        "--pid", pid_str,
+                        "--tid", tid_str,
+                        "--sig", sig_str,
+                        "--prstatus_fd", prstatus_fd_str,
+                        NULL };
 
        int fd = open(cinfo->info_path, O_WRONLY | O_CREAT, 0600);
        if (fd < 0) {

diff --git a/src/log_dump/log_dump.c b/src/log_dump/log_dump.c
index bc06957..994ed59 100644 (file)
--- a/src/log_dump/log_dump.c
+++ b/src/log_dump/log_dump.c
@@ -204,7 +204,7 @@ static bool dump_systemstate(const char *const destdir, const char *const timest
                return false;
        }
 
-       char *av[] = {"/usr/bin/dump_systemstate", "-k", "-d", "-j", "-e", "-f", dump_path, NULL};
+       char *av[] = {DUMP_SYSTEMSTATE_BIN_PATH, "-k", "-d", "-j", "-e", "-f", dump_path, NULL};
        spawn_param_s param = { .fn = spawn_setstdout, .u.int_val = STDERR_FILENO };
        bool is_ok = spawn_wait(av, NULL, &param, 0, exit_code);