Merge release-21.05 into staging-next-21.05
This commit is contained in:
commit
1785d7020c
|
@ -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 \
|
||||
|
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts/bpf_helpers_doc.py
|
||||
patchShebangs scripts/bpf*_doc.py
|
||||
'';
|
||||
|
||||
doCheck = false; # requires "sparse"
|
||||
|
|
Loading…
Reference in New Issue