diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-08 12:01:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-08 12:01:52 +0000 |
commit | 81871f4c87a029aa89e9e9f58037ab2bc50baf0b (patch) | |
tree | 0503b9eba37e27fbd54e8cdd749180eb06b5e75b /pkgs/os-specific/linux/kernel/manual-config.nix | |
parent | 187f681cb4921d413ad940834baab18654cb0f9a (diff) | |
parent | 0b4a97a07f72bcf265034e5e2d95d6fa02e694a7 (diff) | |
download | nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.gz nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.bz2 nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.lz nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.xz nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.zst nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index f719c51ba53..52216696848 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -117,7 +117,8 @@ let }); postPatch = '' - sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|' + # Ensure that depmod gets resolved through PATH + sed -i Makefile -e 's|= /sbin/depmod|= depmod|' # fixup for pre-4.15 kernels using the $(cd $foo && /bin/pwd) pattern # FIXME: remove when no longer needed @@ -332,9 +333,6 @@ let # Delete empty directories find -empty -type d -delete - - # Remove reference to kmod - sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|' ''; requiredSystemFeatures = [ "big-parallel" ]; @@ -370,13 +368,12 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ] + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ] ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools ++ optional (lib.versionOlder version "5.8") libelf ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] ++ optional (lib.versionAtLeast version "5.8") elfutils - ++ optional (lib.versionAtLeast version "6.6") kmod ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; |