src/image: rename parameter initramfs_image -> initramfs

This allows to have the argument automatically populated by
`callPackage`.
master
Adam Joseph 1 year ago
parent d4372b0df2
commit 01549c9400

@ -27,9 +27,7 @@ let
iasl_20180531 = final.nixpkgsOnBuildForBuild.callPackage ./coreboot/iasl_20180531 { }; iasl_20180531 = final.nixpkgsOnBuildForBuild.callPackage ./coreboot/iasl_20180531 { };
coreboot = final.callPackage ./coreboot { }; coreboot = final.callPackage ./coreboot { };
image = final.callPackage ./image { image = final.callPackage ./image { };
initramfs_image = final.initramfs;
};
kernel = final.callPackage ./kernel { }; kernel = final.callPackage ./kernel { };
userspace = final.callPackage ./userspace { }; userspace = final.callPackage ./userspace { };
initramfs = final.callPackage ./initramfs { }; initramfs = final.callPackage ./initramfs { };

@ -7,7 +7,7 @@
, payload-compression-type ? "none" , payload-compression-type ? "none"
, payload-prefix ? "prefix" , payload-prefix ? "prefix"
, payload-name ? "payload" , payload-name ? "payload"
, initramfs_image # path to the initramfs `cpio` archive , initramfs ? null # initramfs `cpio` archive
, linux-command-line ? null , linux-command-line ? null
}: }:
@ -34,8 +34,8 @@ nixpkgsOnBuildForHost.stdenv.mkDerivation {
"-c${payload-compression-type}" "-c${payload-compression-type}"
] ++ lib.optionals (linux-command-line != null) [ ] ++ lib.optionals (linux-command-line != null) [
"-C'${linux-command-line}'" "-C'${linux-command-line}'"
] ++ lib.optionals (initramfs_image != null) [ ] ++ lib.optionals (initramfs != null) [
"-I'${initramfs_image}'" "-I'${initramfs}'"
] ++ [ ] ++ [
"\n" "\n"
]); ]);

@ -78,7 +78,7 @@ in {
image = prev.image.override { image = prev.image.override {
payload = "${final.fit}/Image.fit"; payload = "${final.fit}/Image.fit";
initramfs_image = null; # it is part of the FIT image initramfs = null; # it is part of the FIT image
}; };
coreboot = coreboot =

Loading…
Cancel
Save