BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel, initrd: Remove legacy ubootChooser

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/build-support/kernel/make-initrd.nix
View file

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

6
pkgs/os-specific/linux/kernel/manual-config.nix
View file

@ -1,5 +1,5 @@
{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl { runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, writeTextFile, ubootChooser , writeTextFile, ubootTools
, hostPlatform , hostPlatform
}: }:
@ -225,7 +225,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null) nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null)
(ubootChooser stdenv.platform.uboot); ubootTools;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; 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 # 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 # can just go into buildInputs (but not nativeBuildInputs since cp.uboot
# may be different from stdenv.platform.uboot) # may be different from stdenv.platform.uboot)
buildInputs = optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv; buildInputs = optional (cp.uboot != null) ubootTools.crossDrv;
}; };
}) })

3
pkgs/top-level/all-packages.nix
View file

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