summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/manual-config.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2015-02-20 21:54:05 +0000
committerLluís Batlle i Rossell <viric@viric.name>2015-03-05 09:10:15 +0000
commit42c6115872c6d1ec471605006e258daaca1ceee5 (patch)
tree9199ce2174ea600cb404678ef27ee058dc0c45f6 /pkgs/os-specific/linux/kernel/manual-config.nix
parent3e92c4e0ffd26949ea73dafb02eddbf245f80e85 (diff)
downloadnixpkgs-42c6115872c6d1ec471605006e258daaca1ceee5.tar
nixpkgs-42c6115872c6d1ec471605006e258daaca1ceee5.tar.gz
nixpkgs-42c6115872c6d1ec471605006e258daaca1ceee5.tar.bz2
nixpkgs-42c6115872c6d1ec471605006e258daaca1ceee5.tar.lz
nixpkgs-42c6115872c6d1ec471605006e258daaca1ceee5.tar.xz
nixpkgs-42c6115872c6d1ec471605006e258daaca1ceee5.tar.zst
nixpkgs-42c6115872c6d1ec471605006e258daaca1ceee5.zip
kernel: I forgot $makeFlags in make dtbs
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index cfbd9b9774f..7bc1de8ed0b 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -118,14 +118,12 @@ let
       # Some image types need special install targets (e.g. uImage is installed with make uinstall)
       installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else "install") ];
 
-      postInstall = optionalString installsFirmware ''
+      postInstall = (optionalString installsFirmware ''
         mkdir -p $out/lib/firmware
-      '' + (if (platform ? kernelDTB && platform.kernelDTB) then ''
-	set -x
- 	make dtbs
+      '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
+ 	make "$makeFlags" dtbs
         cp arch/$arch/boot/dts/*dtb $out
       '' else "") + (if isModular then ''
-	set -x
         make modules_install $makeFlags "''${makeFlagsArray[@]}" \
           $installFlags "''${installFlagsArray[@]}"
         unlink $out/lib/modules/${modDirVersion}/build