make-squashfs: add support for generating hydra build products

left default to write the image directly to the store, but enabling hydraBuildProduct
will create $out as a directory
This commit is contained in:
Adam Stephens 2024-08-17 09:00:43 -04:00
parent cddd7b164c
commit 9277993de4
No known key found for this signature in database

View File

@ -10,6 +10,9 @@
, # Compression parameters. , # Compression parameters.
# For zstd compression you can use "zstd -Xcompression-level 6". # For zstd compression you can use "zstd -Xcompression-level 6".
comp ? "xz -Xdict-size 100%" comp ? "xz -Xdict-size 100%"
, # create hydra build product. will put image in directory instead
# of directly in the store
hydraBuildProduct ? false
}: }:
let let
@ -17,7 +20,7 @@ let
compFlag = if comp == null then "-no-compression" else "-comp ${comp}"; compFlag = if comp == null then "-no-compression" else "-comp ${comp}";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${fileName}.img"; name = "${fileName}${lib.optionalString (!hydraBuildProduct) ".img"}";
__structuredAttrs = true; __structuredAttrs = true;
nativeBuildInputs = [ squashfsTools ]; nativeBuildInputs = [ squashfsTools ];
@ -30,7 +33,13 @@ stdenv.mkDerivation {
# for nix-store --load-db. # for nix-store --load-db.
cp $closureInfo/registration nix-path-registration cp $closureInfo/registration nix-path-registration
imgPath="$out"
'' + lib.optionalString hydraBuildProduct ''
mkdir $out
imgPath="$out/${fileName}.squashfs"
'' + lib.optionalString stdenv.buildPlatform.is32bit '' '' + lib.optionalString stdenv.buildPlatform.is32bit ''
# 64 cores on i686 does not work # 64 cores on i686 does not work
# fails with FATAL ERROR: mangle2:: xz compress failed with error code 5 # fails with FATAL ERROR: mangle2:: xz compress failed with error code 5
if ((NIX_BUILD_CORES > 48)); then if ((NIX_BUILD_CORES > 48)); then
@ -39,8 +48,12 @@ stdenv.mkDerivation {
'' + '' '' + ''
# Generate the squashfs image. # Generate the squashfs image.
mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out ${pseudoFilesArgs} \ mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $imgPath ${pseudoFilesArgs} \
-no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 ${compFlag} \ -no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 ${compFlag} \
-processors $NIX_BUILD_CORES -processors $NIX_BUILD_CORES
'' + lib.optionalString hydraBuildProduct ''
mkdir -p $out/nix-support
echo "file squashfs-image $out/${fileName}.squashfs" >> $out/nix-support/hydra-build-products
''; '';
} }