diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-12-31 01:39:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 01:39:13 +0100 |
| commit | 1d88a5f3b1910265763b16af703d4adb8658e7c8 (patch) | |
| tree | 973f8e5bf6e3d29039af4c89ef86c5815e587465 /nixos | |
| parent | 41dda835e2bce1270e837d9b5eaa5f78404aa45e (diff) | |
| parent | 9dbaa79fb2e51ef2d165109314987a5f5c1cb198 (diff) | |
Merge pull request #277209 from NixOS/backport-276930-to-release-23.11
[Backport release-23.11] nixos/lib/make-disk-image: Create build products metadata for hydra
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index e5d82f4de7c9d..1a33abd01ea18 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -522,11 +522,16 @@ let format' = format; in let chmod 0644 $efiVars ''; + createHydraBuildProducts = '' + mkdir -p $out/nix-support + echo "file ${format}-image $out/${filename}" >> $out/nix-support/hydra-build-products + ''; + buildImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name { preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars; buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ]; - postVM = moveOrConvertImage + postVM; + postVM = moveOrConvertImage + createHydraBuildProducts + postVM; QEMU_OPTS = concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" ++ lib.optionals touchEFIVars [ @@ -616,5 +621,5 @@ let format' = format; in let in if onlyNixStore then pkgs.runCommand name {} - (prepareImage + moveOrConvertImage + postVM) + (prepareImage + moveOrConvertImage + createHydraBuildProducts + postVM) else buildImage |