public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make-initrd: allow specifying name

Browse Source 
Also moves the argument defaults out of all-packages.nix and into
make-initrd itself.
This commit is contained in:
Linus Heckemann 2019-04-13 22:29:47 +02:00
parent 8a0b2714fb
commit 3b16f345b5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/kernel/make-initrd.nix
View File

@ -12,11 +12,14 @@
# `contents = {object = ...; symlink = /init;}' is a typical # `contents = {object = ...; symlink = /init;}' is a typical
# argument. # argument.
{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools { stdenv, perl, cpio, contents, ubootTools
, name ? "initrd"
, compressor ? "gzip -9n"
, prepend ? []
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "initrd"; inherit name;
builder = ./make-initrd.sh; builder = ./make-initrd.sh;
makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage"; makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage";

5
pkgs/top-level/all-packages.nix
View File

@ -330,10 +330,7 @@ in
makeAutostartItem = callPackage ../build-support/make-startupitem { }; makeAutostartItem = callPackage ../build-support/make-startupitem { };
makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out
callPackage ../build-support/kernel/make-initrd.nix {
inherit contents compressor prepend;
};
makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; } makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; }
../build-support/setup-hooks/make-wrapper.sh; ../build-support/setup-hooks/make-wrapper.sh;