From a343ff7e1433130ac293e96bb04ea5dbe363fff1 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 3 Sep 2020 14:11:41 +0200 Subject: makeInitrd: make uinitrd behaviour optional --- pkgs/build-support/kernel/make-initrd.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index ed5dbdaee17..3915335b8da 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -17,6 +17,7 @@ , compressor ? "gzip -9n" , prepend ? [] , lib +, makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage" }: let # !!! Move this into a public lib function, it is probably useful for others @@ -24,12 +25,10 @@ let lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); in stdenvNoCC.mkDerivation rec { - inherit name; + inherit name makeUInitrd; builder = ./make-initrd.sh; - makeUInitrd = stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage"; - nativeBuildInputs = [ perl cpio ] ++ stdenvNoCC.lib.optional makeUInitrd ubootTools; -- cgit 1.4.1