Commit fc37c2d5 authored by Kiskae's avatar Kiskae
Browse files

linuxManualConfig: generalize `depmod` resolution

parent 9f9d9a6d

pkgs/os-specific/linux/kernel/manual-config.nix

+3 −6
Original line number Diff line number Diff line
@@ -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-5.4 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" ];