cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #115925 from wentasah/kernelshark-1.2

Browse source
This commit is contained in:
Sandro 2021-04-06 10:20:14 +02:00 committed by GitHub
commit ee6279bb68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/linux/trace-cmd/default.nix
View file

@ -1,9 +1,13 @@
{ lib, stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: { lib, stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "trace-cmd"; pname = "trace-cmd";
version = "2.9-dev"; version = "2.9.1";
src = fetchgit (import ./src.nix); src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "trace-cmd-v${version}";
sha256 = "19c63a0qmcppm1456qf4k6a0d1agcvpa6jnbzrdcyc520yax6khw";
};
patches = [ ./fix-Makefiles.patch ]; patches = [ ./fix-Makefiles.patch ];

24
pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
View file

@ -1,30 +1,30 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index bbdf15e..deb8ef7 100644 index b034042..b8a06bc 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -288,7 +288,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC) @@ -338,6 +338,7 @@ libtracefs.a: $(LIBTRACEFS_STATIC)
libtracecmd.a: $(LIBTRACECMD_STATIC) libtracefs.so: $(LIBTRACEFS_SHARED)
libtracecmd.so: $(LIBTRACECMD_SHARED)
-libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACEFS_SHARED)
+libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) +libs: $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC)
plugins: force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(obj)/lib/traceevent/plugins/trace_python_dir test: force $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC) $(LIBTRACECMD_STATIC)
$(Q)$(MAKE) -C $(src)/lib/traceevent/plugins ifneq ($(CUNIT_INSTALLED),1)
@@ -344,6 +344,8 @@ install_gui: install_cmd gui @@ -414,6 +415,9 @@ install_libs: libs
install_libs: libs
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd) $(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd)
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent) $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
$(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)/tracefs)
+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)/trace-cmd) + $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)/trace-cmd)
+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)/traceevent) + $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)/traceevent)
+ $(Q)$(call do_install,$(LIBTRACEFS_STATIC),$(libdir_SQ)/tracefs)
$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent) $(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/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd) $(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd)
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index e20a030..7fce165 100644 index 457c100..687e150 100644
--- a/kernel-shark/src/CMakeLists.txt --- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt +++ b/kernel-shark/src/CMakeLists.txt
@@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) @@ -92,7 +92,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME}) DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy" install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"

11
pkgs/os-specific/linux/trace-cmd/kernelshark.nix
View file

@ -1,9 +1,13 @@
{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: { lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
mkDerivation { mkDerivation rec {
pname = "kernelshark"; pname = "kernelshark";
version = "1.1.0"; version = "1.2";
src = fetchgit (import ./src.nix); src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "kernelshark-v${version}";
sha256 = "0wzzm2imk9n94v96v6sbvbff6j47lz4qj0snhiyv3nj3slg0anvh";
};
patches = [ ./fix-Makefiles.patch ]; patches = [ ./fix-Makefiles.patch ];
@ -21,6 +25,7 @@ mkDerivation {
"-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include" "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include"
"-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/trace-cmd/libtracecmd.a" "-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/trace-cmd/libtracecmd.a"
"-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/traceevent/libtraceevent.a" "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/traceevent/libtraceevent.a"
"-DTRACEFS_LIBRARY=${trace-cmd.lib}/lib/tracefs/libtracefs.a"
]; ];
preInstall = '' preInstall = ''

5
pkgs/os-specific/linux/trace-cmd/src.nix
View file

@ -1,5 +0,0 @@
{
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "ab370b78b9278fe16657742d46cb95c0a65b47d5"; # branch: kernelshark-v1.1
sha256 = "0qngwc4qgadrkwlwpz73f12prdkx94kl0bg7g9hib95ipvsdmk1c";
}