alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch

36 lines
1.8 KiB
Diff
Raw Normal View History

trace-cmd: 2.6 -> 2.8-c8d9e1a
2019-04-27 12:34:05 +01:00
diff --git a/Makefile b/Makefile
trace-cmd: 2.9-dev -> 2.9.1, kernelshark: 1.1.0 -> 1.2 Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
2021-03-11 12:12:34 +00:00
index b034042..b8a06bc 100644
trace-cmd: 2.6 -> 2.8-c8d9e1a
2019-04-27 12:34:05 +01:00
--- a/Makefile
+++ b/Makefile
trace-cmd: 2.9-dev -> 2.9.1, kernelshark: 1.1.0 -> 1.2 Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
2021-03-11 12:12:34 +00:00
@@ -338,6 +338,7 @@ libtracefs.a: $(LIBTRACEFS_STATIC)
libtracefs.so: $(LIBTRACEFS_SHARED)
trace-cmd: 2.6 -> 2.8-c8d9e1a
2019-04-27 12:34:05 +01:00
trace-cmd: 2.9-dev -> 2.9.1, kernelshark: 1.1.0 -> 1.2 Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
2021-03-11 12:12:34 +00:00
libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACEFS_SHARED)
+libs: $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC)
trace-cmd: 2.6 -> 2.8-c8d9e1a
2019-04-27 12:34:05 +01:00
trace-cmd: 2.9-dev -> 2.9.1, kernelshark: 1.1.0 -> 1.2 Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
2021-03-11 12:12:34 +00:00
test: force $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC) $(LIBTRACECMD_STATIC)
ifneq ($(CUNIT_INSTALLED),1)
@@ -414,6 +415,9 @@ install_libs: libs
tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0
2019-10-26 13:35:38 +01:00
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd)
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
trace-cmd: 2.9-dev -> 2.9.1, kernelshark: 1.1.0 -> 1.2 Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
2021-03-11 12:12:34 +00:00
$(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)/tracefs)
tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0
2019-10-26 13:35:38 +01:00
+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)/trace-cmd)
+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)/traceevent)
trace-cmd: 2.9-dev -> 2.9.1, kernelshark: 1.1.0 -> 1.2 Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
2021-03-11 12:12:34 +00:00
+ $(Q)$(call do_install,$(LIBTRACEFS_STATIC),$(libdir_SQ)/tracefs)
trace-cmd: 2.8-0c957d2 -> 2.9-dev-1517dc3
2019-07-25 20:30:46 +01:00
$(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)
tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0
2019-10-26 13:35:38 +01:00
$(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
trace-cmd: 2.9-dev -> 2.9.1, kernelshark: 1.1.0 -> 1.2 Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
2021-03-11 12:12:34 +00:00
index 457c100..687e150 100644
tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0
2019-10-26 13:35:38 +01:00
--- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt
trace-cmd: 2.9-dev -> 2.9.1, kernelshark: 1.1.0 -> 1.2 Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
2021-03-11 12:12:34 +00:00
@@ -92,7 +92,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0
2019-10-26 13:35:38 +01:00
DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
trace-cmd: 2.6 -> 2.8-c8d9e1a
2019-04-27 12:34:05 +01:00
tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0
2019-10-26 13:35:38 +01:00
install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
- DESTINATION /usr/share/polkit-1/actions/)
+ DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
trace-cmd: 2.6 -> 2.8-c8d9e1a
2019-04-27 12:34:05 +01:00
tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0
2019-10-26 13:35:38 +01:00
install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
DESTINATION ${_INSTALL_PREFIX}/bin/)
Copy permalink