public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linuxManualConfig: Fix build on non-modular kernels

This commit is contained in:
Shea Levy 2018-02-19 15:16:29 -05:00
parent 81081ba670
commit 7ce1f0b8ae
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -155,14 +155,13 @@ let
if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else
"install") ];
postInstall = ''
mkdir -p $dev
cp vmlinux $dev/
'' + (optionalString installsFirmware ''
postInstall = (optionalString installsFirmware ''
mkdir -p $out/lib/firmware
'') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
'' else "") + (if isModular then ''
mkdir -p $dev
cp vmlinux $dev/
if [ -z "$dontStrip" ]; then
installFlagsArray+=("INSTALL_MOD_STRIP=1")
fi

2
pkgs/top-level/all-packages.nix
View File

@ -13331,7 +13331,7 @@ with pkgs;
linux_samus_latest = linuxPackages_samus_latest.kernel;
# A function to build a manually-configured kernel
linuxManualConfig = pkgs.buildLinux;
linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {});
keyutils = callPackage ../os-specific/linux/keyutils { };