nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-30 16:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

linuxPackages / aggregateModules: Minor improvements post-module-signing (#577219)

Browse Source
This commit is contained in:
K900
2026-10-22 08:02:48 +00:00
committed by GitHub
parent e959cbd51e 4c2edecc43
commit a57611f1a4
8 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/kernel-module-verification.nix
View File

@@ -24,7 +24,6 @@ let
"M=$(PWD)"
"INSTALL_MOD_PATH=${placeholder "out"}"
"DEPMOD=true"
]
++ kernelModuleMakeFlags;

1
pkgs/os-specific/linux/amneziawg/default.nix
View File

@@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
installFlags = [
"DEPMOD=true"
"INSTALL_MOD_PATH=${placeholder "out"}"
];

5
pkgs/os-specific/linux/kmod/aggregator.nix
View File

@@ -11,6 +11,11 @@ buildEnv {
paths = modules;
pathsToLink = [
"/lib/modules"
"/etc/depmod.d"
];
postBuild = ''
source ${stdenvNoCC}/setup

2
pkgs/os-specific/linux/netatop/fix-makefile-install.patch
View File

@@ -8,7 +8,7 @@ diff --color -ruN netatop-3.2.2.orig/Makefile netatop-3.2.2/Makefile
- cd /usr/src; dkms add -m netatop -v $(CURVERS)
- dkms build -m netatop -v $(CURVERS)
- dkms install -m netatop -v $(CURVERS)
+ $(MAKE) -C $(KERNDIR) M=$(THISDIR) modules_install INSTALL_MOD_PATH=$(out) INSTALL_MOD_DIR=extra DEPMOD=true
+ $(MAKE) -C $(KERNDIR) M=$(THISDIR) modules_install INSTALL_MOD_PATH=$(out) INSTALL_MOD_DIR=extra
#
- install netatopd -t /usr/sbin
- install -m 0644 netatop.service -t /lib/systemd/system

1
pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix
View File

@@ -47,7 +47,6 @@ stdenv.mkDerivation {
];
buildTargets = [ "modules" ];
installFlags = [ "INSTALL_MOD_STRIP=1" ];
installTargets = [ "modules_install" ];
enableParallelBuilding = true;

1
pkgs/os-specific/linux/virtio_vmmci/default.nix
View File

@@ -29,7 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
makeFlags = kernelModuleMakeFlags ++ [
"DEPMOD=echo"
"INSTALL_MOD_PATH=$(out)"
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

1
pkgs/os-specific/linux/vmm_clock/default.nix
View File

@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
'';
makeFlags = kernelModuleMakeFlags ++ [
"DEPMOD=echo"
"INSTALL_MOD_PATH=$(out)"
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2
pkgs/top-level/linux-kernels.nix
View File

@@ -239,6 +239,8 @@ in
inherit (kernel) kernelOlder kernelAtLeast;
kernelModuleMakeFlags = self.kernel.commonMakeFlags ++ [
"KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"DEPMOD=true"
"INSTALL_MOD_STRIP=1"
];
# Obsolete aliases (these packages do not depend on the kernel).
inherit (pkgs) odp-dpdk pktgen; # added 2018-05