diff --git a/src/default.nix b/src/default.nix index 410f15c..7e8e1b2 100644 --- a/src/default.nix +++ b/src/default.nix @@ -15,7 +15,7 @@ let iasl_20180531 = self.nixpkgsOnBuildForBuild.callPackage ./coreboot/iasl_20180531 { }; coreboot = self.callPackage ./coreboot { - initramfs_image = "${self.initramfs}/initramfs.cpio"; + initramfs_image = self.initramfs; }; kernel = self.callPackage ./kernel { }; initramfs = self.callPackage ./initramfs { diff --git a/src/initramfs/default.nix b/src/initramfs/default.nix index 883bffb..c865950 100644 --- a/src/initramfs/default.nix +++ b/src/initramfs/default.nix @@ -8,12 +8,11 @@ }: nixpkgsOnBuildForHost.stdenv.mkDerivation { - name = "initramfs"; + name = "initramfs.cpio"; nativeBuildInputs = with nixpkgsOnBuildForBuild; [ findutils cpio ]; srcs = [ ]; dontUnpack = true; buildPhase = '' - mkdir -p $out mkdir build mkdir -p build/lib/modules BUILD=$(pwd)/build @@ -25,7 +24,7 @@ nixpkgsOnBuildForHost.stdenv.mkDerivation { popd chmod -R u+w $BUILD pushd $BUILD - find . | cpio --create -H newc -R +0:+0 > $out/initramfs.cpio + find . | cpio --create -H newc -R +0:+0 > $out popd ''; dontInstall = true; diff --git a/src/platform/kevin/fit/default.nix b/src/platform/kevin/fit/default.nix index 9ecfb9a..81184e7 100644 --- a/src/platform/kevin/fit/default.nix +++ b/src/platform/kevin/fit/default.nix @@ -8,7 +8,7 @@ }: let initramfs_lzma = runCommand "initramfs.lzma" { } '' - lzma < ${initramfs}/initramfs.cpio > $out; + lzma < ${initramfs} > $out; ''; in stdenv.mkDerivation { name = "ownerboot-stage1-fit";