diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-08-06 20:22:09 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-09-06 10:21:45 +0000 |
| commit | f6d64df72021dfbd9c67bb956226f3e270a4e145 (patch) | |
| tree | 1c1273dc3f356df562ffb9a56370f090ae10556c | |
| parent | Merge #252113: mariadb*: patch-level updates (diff) | |
| download | nixpkgs-f6d64df72021dfbd9c67bb956226f3e270a4e145.tar.gz | |
linuxPackages_testing.perf: fix patchShebang
Without the change `perf` build fails as:
$ nix build --no-link -f. linuxPackages_testing.perf -L
build flags: SHELL=/nix/store/p6dlr3skfhxpyphipg2bqnj52999banh-bash-5.2-p15/bin/bash prefix=\$\(out\) WERROR=0 ASCIIDOC8=1 O=\$\(buildRoot\) CC=/nix/store/bxic6j2whyg3z4h2x3xjyqgp7fl83bnp-gcc-wrapper-12.3.0/bin/cc HOSTCC=/nix/store/bxic6j2whyg3z4h2x3xjyqgp7fl83bnp-gcc-wrapper-12.3.0/bin/cc HOSTLD=/nix/store/kcp78dk7h5gcs7d4qss7rbz3skxhzdnn-binutils-wrapper-2.40/bin/ld ARCH=x86_64 NO_GTK2=1
BUILD: Doing 'make -j16' parallel build
HOSTCC fixdep.o
HOSTLD fixdep-in.o
LINK fixdep
make[1]: ./check-headers.sh: No such file or directory
make[1]: *** [Makefile.perf:241: sub-make] Error 127
make: *** [Makefile:70: all] Error 2
This started happening because upstream linux commit
https://github.com/torvalds/linux/commit/d6748385098a8333a0e1c7e2d77119c919776728
changed shebang from /bin/sh to /bin/bash.
Let's retroactively switch all `perf` releases to shell interpreter from
store.
(cherry picked from commit 0768fe799a7999f2d9cd19ec8707db2d5bec93ac)
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 620ecfc43df2..2fc82b2e10be 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { postPatch = '' # Linux scripts patchShebangs scripts - + patchShebangs tools/perf/check-headers.sh '' + lib.optionalString (lib.versionAtLeast kernel.version "6.3") '' # perf-specific scripts patchShebangs tools/perf/pmu-events |