pyrox.dev
linuxPackages.perf: fix path to dmesg
authored by
Sandro Jäckel
and committed by
John Titor
e12175e3
062beac7
+5
-6
pkgs/os-specific/linux/kernel/perf/default.nix
+5
-6
pkgs/os-specific/linux/kernel/perf/default.nix
···
57
57
58
58
stdenv.mkDerivation {
59
59
pname = "perf-linux";
60
-
version = kernel.version;
60
+
inherit (kernel) version src;
61
61
62
-
inherit (kernel) src;
63
-
64
-
# Fix 6.10.0 holding pkg-config completely wrong.
65
-
# Patches from perf-tools-next, should be in 6.11 or hopefully backported.
66
-
patches = lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [
62
+
patches = [
63
+
# fix wrong path to dmesg
64
+
./fix-dmesg-path.diff
65
+
] ++ lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [
67
66
(fetchpatch {
68
67
url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b";
69
68
hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM=";
+11
pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff
+11
pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff
···
1
+
--- a/tools/perf/util/evsel.c 2023-10-20 15:50:53.011023294 +0200
2
+
+++ b/tools/perf/util/evsel.c 2023-10-20 15:51:03.205997633 +0200
3
+
@@ -3076,7 +3076,7 @@
4
+
5
+
return scnprintf(msg, size,
6
+
"The sys_perf_event_open() syscall returned with %d (%s) for event (%s).\n"
7
+
- "/bin/dmesg | grep -i perf may provide additional information.\n",
8
+
+ "\"dmesg | grep -i perf\" may provide additional information.\n",
9
+
err, str_error_r(err, sbuf, sizeof(sbuf)), evsel__name(evsel));
10
+
}
11
+