From 42c6115872c6d1ec471605006e258daaca1ceee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 20 Feb 2015 21:54:05 +0000 Subject: [PATCH] kernel: I forgot $makeFlags in make dtbs --- pkgs/os-specific/linux/kernel/manual-config.nix | 8 +++----- 1 file 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