diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-12-10 20:19:35 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-12-10 20:24:08 +0200 |
| commit | bdab6fe5a16680adafdda6ab728065a740de177b (patch) | |
| tree | 1a669def84b1a7ef6fa76df8598e4bc05c645ad0 /pkgs | |
| parent | ec7cdd95a7f0b323c11ad3ae054f812607e6d784 (diff) | |
| download | nixpkgs-bdab6fe5a16680adafdda6ab728065a740de177b.tar nixpkgs-bdab6fe5a16680adafdda6ab728065a740de177b.tar.gz nixpkgs-bdab6fe5a16680adafdda6ab728065a740de177b.tar.bz2 nixpkgs-bdab6fe5a16680adafdda6ab728065a740de177b.tar.lz nixpkgs-bdab6fe5a16680adafdda6ab728065a740de177b.tar.xz nixpkgs-bdab6fe5a16680adafdda6ab728065a740de177b.tar.zst nixpkgs-bdab6fe5a16680adafdda6ab728065a740de177b.zip | |
kernel: Use built-in dtbs_install target instead of rolling our own
In particular, on aarch64 all the .dtb files will be in subdirectories and *.dtb won't match anything.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4ab688c26af..5f890b9b9fe 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -129,9 +129,7 @@ let '' + (optionalString installsFirmware '' mkdir -p $out/lib/firmware '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' - make $makeFlags "''${makeFlagsArray[@]}" dtbs - mkdir -p $out/dtbs - cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs + make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs '' else "") + (if isModular then '' if [ -z "$dontStrip" ]; then installFlagsArray+=("INSTALL_MOD_STRIP=1") |