kernel, initrd: Remove legacy ubootChooser

This commit is contained in:
Tuomas Tynkkynen 2017-11-03 15:55:09 +02:00
parent cf610f8a48
commit b50693d16c
3 changed files with 5 additions and 8 deletions

View file

@ -12,13 +12,13 @@
# `contents = {object = ...; symlink = /init;}' is a typical
# argument.
{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend
{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools
, hostPlatform
}:
let
inputsFun = ubootName : [ perl cpio ]
++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ];
++ stdenv.lib.optional (ubootName != null) ubootTools;
makeUInitrdFun = ubootName : (ubootName != null);
in
stdenv.mkDerivation {

View file

@ -1,5 +1,5 @@
{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, writeTextFile, ubootChooser
, writeTextFile, ubootTools
, hostPlatform
}:
@ -225,7 +225,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
enableParallelBuilding = true;
nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null)
(ubootChooser stdenv.platform.uboot);
ubootTools;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];
@ -248,6 +248,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
# crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot
# can just go into buildInputs (but not nativeBuildInputs since cp.uboot
# may be different from stdenv.platform.uboot)
buildInputs = optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv;
buildInputs = optional (cp.uboot != null) ubootTools.crossDrv;
};
})

View file

@ -13002,9 +13002,6 @@ with pkgs;
tunctl = callPackage ../os-specific/linux/tunctl { };
# TODO(dezgeg): either refactor & use ubootTools directly, or remove completely
ubootChooser = name: ubootTools;
# Upstream U-Boots:
inherit (callPackage ../misc/uboot {})
buildUBoot