treewide: kernel.makeFlags -> kernel.moduleMakeFlags

This commit is contained in:
K900
2025-01-23 14:00:43 +03:00
parent c805021f3a
commit aa3e94fe7c
64 changed files with 77 additions and 72 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg=";
};
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
];
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sourceRoot = "${src.name}/src";
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
];
makeFlags =
kernel.makeFlags
kernel.moduleMakeFlags
++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]
++ lib.optional (lib.versionAtLeast kernel.version "5.6") "KERNEL_SOURCE_DIR=${srcOnly kernel}";
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "pic" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
--replace "/lib/modules" "${kernel.dev}/lib/modules"
'';
makeFlags = kernel.makeFlags;
makeFlags = kernel.moduleMakeFlags;
installPhase = ''
mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq";
};
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=${placeholder "out"}"
];
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
"prefix=$(out)"
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
--replace depmod \#
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"KVER=${kernel.modDirVersion}"
"KERNEL_MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
rm -r $out/lib/udev
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KVERSION=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"DESTDIR=${placeholder "out"}"
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" ];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"INSTALL_MOD_PATH=${placeholder "out"}"
];
KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"KVER=${kernel.version}"
"INSTALL_MOD_PATH=${placeholder "out"}"
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "pic" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags;
makeFlags = kernel.moduleMakeFlags;
env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
python3WithLibs
];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KVER=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" ];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"INSTALL_MOD_PATH=${placeholder "out"}"
];
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
cd src
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"-C"
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"M=$(PWD)"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build"
"INSTALL_MOD_PATH=$(out)"
];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"VERSION=${version}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
sourceRoot = "${src.name}/hid-t150";
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=${placeholder "out"}"
];
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"VERSION=${version}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"-C src/mod"
"INSTALL_MOD_PATH=${placeholder "out"}"
];
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
"WERROR=0"
"ASCIIDOC8=1"
]
++ kernel.makeFlags
++ kernel.moduleMakeFlags
++ lib.optional (!withGtk) "NO_GTK2=1"
++ lib.optional (!withZstd) "NO_LIBZSTD=1"
++ lib.optional (!withLibcap) "NO_LIBCAP=1";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
sed -i -e '/depmod/d' ./Makefile
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"SHELL=bash"
"KERNELVERSION=${kernel.modDirVersion}"
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNEL=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=${placeholder "out"}"
];
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags;
makeFlags = kernel.moduleMakeFlags;
buildPhase = ''
make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "pic" ];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KVER=${kernel.modDirVersion}"
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"-C"
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"M=$(sourceRoot)"
+1 -1
View File
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
kmod=${kmod} substituteAllInPlace netatop.service
'';
makeFlags = kernel.makeFlags;
makeFlags = kernel.moduleMakeFlags;
preInstall = ''
mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8}
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -215,7 +215,7 @@ let
kernelVersion = if libsOnly then null else kernel.modDirVersion;
makeFlags = lib.optionals (!libsOnly) (
kernel.makeFlags
kernel.moduleMakeFlags
++ [
"IGNORE_PREEMPT_RT_PRESENCE=1"
"NV_BUILD_SUPPORTS_HMM=1"
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation (
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation (
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"VERSION=${version}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
# avoid using the Makefile directly -- it doesn't understand
# any kernel but the current.
# based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"M=$(PWD)/src"
"modules"
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
(
"CONFIG_PLATFORM_I386_PC="
+3 -1
View File
@@ -25,7 +25,9 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ];
makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
makeFlags = kernel.moduleMakeFlags ++ [
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags;
makeFlags = kernel.moduleMakeFlags;
hardeningDisable = [ "pic" ];
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
hardeningDisable = [ "pic" ];
nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags;
makeFlags = kernel.moduleMakeFlags;
prePatch = ''
substituteInPlace ./Makefile \
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "pic" ];
nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags;
makeFlags = kernel.moduleMakeFlags;
prePatch = ''
substituteInPlace ./Makefile \
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "pic" ];
nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags;
makeFlags = kernel.moduleMakeFlags;
prePatch = ''
substituteInPlace ./Makefile \
+3 -1
View File
@@ -20,7 +20,9 @@ stdenv.mkDerivation {
};
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
makeFlags = kernel.moduleMakeFlags ++ [
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
+3 -1
View File
@@ -20,7 +20,9 @@ stdenv.mkDerivation {
};
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
makeFlags = kernel.moduleMakeFlags ++ [
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
@@ -17,7 +17,9 @@ kernel.stdenv.mkDerivation {
};
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
installTargets = [ "modules_install" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
libgcrypt
lvm2
];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
cd tools/thermal/tmon
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"INSTALL_ROOT=\"$(out)\""
"BINDIR=bin"
];
+1 -1
View File
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
cp '${./Makefile}' Makefile
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -22,14 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ pahole ];
nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
# kernel makeFlags contain O=$$(buildRoot), that upstream passes through to make and causes build failure, so we filter it out here
makeFlags =
(lib.filter (flag: lib.head (lib.strings.splitString "=" flag) != "O") kernel.makeFlags)
++ [
"KERNELRELEASE=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=${placeholder "out"}"
];
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELRELEASE=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=${placeholder "out"}"
];
meta = {
broken = stdenv.hostPlatform.isAarch64 || (lib.versionOlder kernel.version "5.5");
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
outputs = [ "out" "bin" ];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kernel ];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
CONFIG_RTC_HCTOSYS yes
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"DEPMOD=echo"
"INSTALL_MOD_PATH=$(out)"
"KERNELRELEASE=${kernel.modDirVersion}"
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
CONFIG_RTC_HCTOSYS yes
'';
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"DEPMOD=echo"
"INSTALL_MOD_PATH=$(out)"
"KERNELRELEASE=${kernel.modDirVersion}"
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = kernel.moduleBuildDependencies;
buildInputs = [ bluez ];
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"-C"
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"M=$(sourceRoot)"
+1 -1
View File
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
"pic"
];
makeFlags = kernel.makeFlags ++ [ "KDIR=${kernelDirectory}" ];
makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernelDirectory}" ];
installTargets = [ "modules_install" ];
+2 -2
View File
@@ -191,10 +191,10 @@ let
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
]
++ kernel.makeFlags
++ kernel.moduleMakeFlags
);
makeFlags = optionals buildKernel kernel.makeFlags;
makeFlags = optionals buildKernel kernel.moduleMakeFlags;
enableParallelBuilding = true;