public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace-cmd/kernelshark: downgrade to the trace-cmd-stable-v2.8 branch

Browse Source
This commit is contained in:
Bas van Dijk
2019-07-27 20:33:33 +02:00
parent 7803c04c7c
commit c9c895062f
4 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+4 -17
View File
@@ -16,10 +16,10 @@ index 21e42fd..826361d 100644
clean:
(cd $(obj); \
diff --git a/Makefile b/Makefile
index 3afd982..8dd55ba 100644
index 2bcc383..107ead0 100644
--- a/Makefile
+++ b/Makefile
@@ -293,7 +293,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
@@ -289,7 +289,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
libtracecmd.a: $(LIBTRACECMD_STATIC)
libtracecmd.so: $(LIBTRACECMD_SHARED)
@@ -28,7 +28,7 @@ index 3afd982..8dd55ba 100644
plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir
$(Q)$(MAKE) -C $(src)/plugins
@@ -349,6 +349,8 @@ install_gui: install_cmd gui
@@ -345,6 +345,8 @@ install_gui: install_cmd gui
install_libs: libs
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
@@ -37,7 +37,7 @@ index 3afd982..8dd55ba 100644
$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
@@ -360,6 +362,12 @@ doc:
@@ -356,6 +358,12 @@ doc:
doc_clean:
$(MAKE) -C $(src)/Documentation clean
@@ -50,16 +50,3 @@ index 3afd982..8dd55ba 100644
install_doc:
$(MAKE) -C $(src)/Documentation install
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index 21494cc..d91c365 100644
--- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt
@@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
- DESTINATION /usr/share/polkit-1/actions/)
+ DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
DESTINATION ${_INSTALL_PREFIX}/bin/)