diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-19 15:16:29 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-19 15:16:29 -0500 |
| commit | 7ce1f0b8ae74fb7dbaa02bbcbe856026314b8c95 (patch) | |
| tree | f7e5d47029d38a9f93d057400adcc5ec5bee148a /pkgs/os-specific/linux/kernel | |
| parent | 81081ba670df15726a37a8d823ccee613de68154 (diff) | |
| download | nixlib-7ce1f0b8ae74fb7dbaa02bbcbe856026314b8c95.tar nixlib-7ce1f0b8ae74fb7dbaa02bbcbe856026314b8c95.tar.gz nixlib-7ce1f0b8ae74fb7dbaa02bbcbe856026314b8c95.tar.bz2 nixlib-7ce1f0b8ae74fb7dbaa02bbcbe856026314b8c95.tar.lz nixlib-7ce1f0b8ae74fb7dbaa02bbcbe856026314b8c95.tar.xz nixlib-7ce1f0b8ae74fb7dbaa02bbcbe856026314b8c95.tar.zst nixlib-7ce1f0b8ae74fb7dbaa02bbcbe856026314b8c95.zip | |
linuxManualConfig: Fix build on non-modular kernels
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index bd9334b8f9b7..ebbc69dec593 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -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 |