Merge release-21.05 into staging-next-21.05

This commit is contained in:
github-actions[bot] 2021-07-29 12:02:32 +00:00 committed by GitHub
commit 1785d7020c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ libopcodes libbfd libelf zlib readline ];
preConfigure = ''
patchShebangs scripts/bpf_helpers_doc.py
patchShebangs scripts/bpf_doc.py
cd tools/bpf
substituteInPlace ./bpftool/Makefile \

View File

@ -55,7 +55,7 @@ stdenv.mkDerivation {
];
postPatch = ''
patchShebangs scripts/bpf_helpers_doc.py
patchShebangs scripts/bpf*_doc.py
'';
doCheck = false; # requires "sparse"