Unverified Commit 5645cd22 authored by Maximilian Bosch's avatar Maximilian Bosch
Browse files

linux: expose make flags for modules in `linuxKernel.packages.linux_X_Y` 

Closes #376820

The issue with providing `moduleMakeFlags` via `passthru` of the kernel
package is that when this package gets overriden[1], the `moduleMakeFlags`
list still references the kernel without the overrides.

This broke e.g. kernel modules of linux-rpi4 which can be reproduced
with

    nix-build --argstr system aarch64-linux -A linuxKernel.packages.linux_rpi4.zfs_2_3

This used to break with

    Error: modDirVersion 6.6.51 specified in the Nix expression is wrong, it should be: 6.6.51-v8

since KBUILD_OUTPUT referenced the kernel without the changes from
`overrideDerivation` that also changes the `modDirVersion`.

The new approach is to add the build flags right into
`linuxKernel.packages.linux_X_Y`: that way we don't need any hacks to
update `moduleMakeFlags` when the derivation with the passthru gets
overridden.

By using the fixpoint of the package-set, the `kernelModuleMakeFlags`
list is correctly updated. E.g. given

    with import ./. {};

    linuxKernel.packages.linux_6_6.extend (self: super: {
      kernel = super.kernel.overrideAttrs (_: {
        name = "linux-snens";
      });
    })

the `makeFlags` is correctly updated:

    $ nix-instantiate snenskek.nix -A zfs_2_3.makeFlags --eval --strict
    [ "ARCH=x86_64" "CROSS_COMPILE=" "KBUILD_OUTPUT=/nix/store/gsp68549k1aqbwxwczpgw67w5jjn4shw-linux-snens-dev/lib/modules/6.6.74/build" ]

[1] E.g. `linux-rpi4`.
parent 16b818f7

pkgs/applications/emulators/cdemu/vhba.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  fetchurl,

  kernel,

  kernelModuleMakeFlags,

}:



stdenv.mkDerivation rec {
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec { 
    hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg=";

  };



  makeFlags = kernel.moduleMakeFlags ++ [

  makeFlags = kernelModuleMakeFlags ++ [

    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

    "INSTALL_MOD_PATH=$(out)"

  ];

pkgs/os-specific/linux/acpi-call/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  fetchFromGitHub,

  kernel,

  kernelModuleMakeFlags,

}:



stdenv.mkDerivation rec {
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = kernel.moduleBuildDependencies;



  makeFlags = kernel.moduleMakeFlags ++ [

  makeFlags = kernelModuleMakeFlags ++ [

    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

  ];

pkgs/os-specific/linux/akvcam/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  fetchFromGitHub,

  kernel,

  kernelModuleMakeFlags,

}:



stdenv.mkDerivation rec {
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec { 
  sourceRoot = "${src.name}/src";



  nativeBuildInputs = kernel.moduleBuildDependencies;

  makeFlags = kernel.moduleMakeFlags ++ [

  makeFlags = kernelModuleMakeFlags ++ [

    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

  ];

pkgs/os-specific/linux/amneziawg/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchFromGitHub,

  srcOnly,

  kernel,

  kernelModuleMakeFlags,

  nix-update-script,

}:
@@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  makeFlags =

    kernel.moduleMakeFlags

    kernelModuleMakeFlags

    ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]

    ++ lib.optional (lib.versionAtLeast kernel.version "5.6") "KERNEL_SOURCE_DIR=${srcOnly kernel}";

pkgs/os-specific/linux/apfs/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  fetchFromGitHub,

  kernel,

  kernelModuleMakeFlags,

  nixosTests,

}:
@@ -23,7 +24,7 @@ stdenv.mkDerivation { 
  hardeningDisable = [ "pic" ];

  nativeBuildInputs = kernel.moduleBuildDependencies;



  makeFlags = kernel.moduleMakeFlags ++ [

  makeFlags = kernelModuleMakeFlags ++ [

    "KERNELRELEASE=${kernel.modDirVersion}"

    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

    "INSTALL_MOD_PATH=$(out)"