diff options
| author | Yordan Karadzhov <ykaradzhov@vmware.com> | 2019-06-14 13:26:57 +0000 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-05 17:30:54 -0400 |
| commit | 1b25ee0b18702ae8a6afff2db234bceab52bdd3c (patch) | |
| tree | f6d2f01a7e28e3b9d1b19a3da222e0f88116679e | |
| parent | 180bc039a5d8b6b0a34ab34d87d399c90964f58a (diff) | |
| download | trace-cmd-1b25ee0b18702ae8a6afff2db234bceab52bdd3c.tar.gz | |
kernel-shark: Avoid TRACECMD_BIN_DIR being set to the build path
The full path to the build directory (which is random for every user)
is embedded in the final binary. This is a no-no for some Linux distros
which are requiring that the finished binaries should not have such paths
embedded in them.
Link: http://lore.kernel.org/linux-trace-devel/20190614132609.16465-3-ykaradzhov@vmware.com
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203187
Reported-by: Troy Engel <troyengel@gmail.com>
Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | kernel-shark/build/FindTraceCmd.cmake | 18 | ||||
| -rw-r--r-- | kernel-shark/build/deff.h.cmake | 2 | ||||
| -rw-r--r-- | kernel-shark/src/KsCaptureDialog.cpp | 7 |
3 files changed, 15 insertions, 12 deletions
diff --git a/kernel-shark/build/FindTraceCmd.cmake b/kernel-shark/build/FindTraceCmd.cmake index 8c51f111..2da4eeee 100644 --- a/kernel-shark/build/FindTraceCmd.cmake +++ b/kernel-shark/build/FindTraceCmd.cmake @@ -12,10 +12,14 @@ # MESSAGE(" Looking for trace-cmd ...") # First search in the user provided paths. -find_path(TRACECMD_BIN_DIR NAMES trace-cmd - PATHS $ENV{TRACE_CMD}/tracecmd/ - ${CMAKE_SOURCE_DIR}/../tracecmd/ - NO_DEFAULT_PATH) +if (CMAKE_BUILD_TYPE MATCHES Debug) + + find_program(TRACECMD_EXECUTABLE NAMES trace-cmd + PATHS $ENV{TRACE_CMD}/tracecmd/ + ${CMAKE_SOURCE_DIR}/../tracecmd/ + NO_DEFAULT_PATH) + +endif (CMAKE_BUILD_TYPE MATCHES Debug) find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h PATHS $ENV{TRACE_CMD}/include/ @@ -34,16 +38,16 @@ find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.a # If not found, search in the default system paths. Note that if the previous # search was successful "find_path" will do nothing this time. -find_path(TRACECMD_BIN_DIR NAMES trace-cmd) +find_program(TRACECMD_EXECUTABLE NAMES trace-cmd) find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h) find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.so) find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.so) -IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY) +IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY AND TRACECMD_EXECUTABLE) SET(TRACECMD_FOUND TRUE) -ENDIF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY) +ENDIF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY AND TRACECMD_EXECUTABLE) IF (TRACECMD_FOUND) diff --git a/kernel-shark/build/deff.h.cmake b/kernel-shark/build/deff.h.cmake index efee2a12..79726ff6 100644 --- a/kernel-shark/build/deff.h.cmake +++ b/kernel-shark/build/deff.h.cmake @@ -18,7 +18,7 @@ #cmakedefine KS_PLUGIN_INSTALL_PREFIX "@KS_PLUGIN_INSTALL_PREFIX@" /** Location of the trace-cmd executable. */ -#cmakedefine TRACECMD_BIN_DIR "@TRACECMD_BIN_DIR@" +#cmakedefine TRACECMD_EXECUTABLE "@TRACECMD_EXECUTABLE@" /** "pkexec" executable. */ #cmakedefine DO_AS_ROOT "@DO_AS_ROOT@" diff --git a/kernel-shark/src/KsCaptureDialog.cpp b/kernel-shark/src/KsCaptureDialog.cpp index b1075952..7f8cf646 100644 --- a/kernel-shark/src/KsCaptureDialog.cpp +++ b/kernel-shark/src/KsCaptureDialog.cpp @@ -489,12 +489,11 @@ KsCaptureDialog::KsCaptureDialog(QWidget *parent) connect(&_captureCtrl._closeButton, &QPushButton::pressed, this, &KsCaptureDialog::close); - if (KsUtils::isInstalled()) - captureExe = QString(_INSTALL_PREFIX) + QString("/bin"); + if (!KsUtils::isInstalled()) + captureExe = QString(_INSTALL_PREFIX) + QString("/bin/trace-cmd"); else - captureExe = TRACECMD_BIN_DIR; + captureExe = TRACECMD_EXECUTABLE; - captureExe += "/trace-cmd"; _captureProc.setProgram(captureExe); _captureMon.connectMe(&_captureProc, &_captureCtrl); |