Do not worry about the store closure in make-ext2-fs
Probably should worry about this.
This commit is contained in:
parent
85a108bdb3
commit
7376302bcc
|
@ -276,7 +276,7 @@ in {
|
|||
};
|
||||
|
||||
storePaths = mkOption {
|
||||
type = with types; listOf package;
|
||||
type = with types; listOf path;
|
||||
description = ''
|
||||
Derivations to be included in the Nix store in the generated boot image.
|
||||
'';
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
let
|
||||
grub' = pkgs.buildPackages.grub2_efi;
|
||||
sdClosureInfo = pkgs.buildPackages.closureInfo {
|
||||
rootPaths = config.genode.boot.storePaths;
|
||||
};
|
||||
|
||||
copyEris = lib.strings.concatMapStrings ({ source, target }: ''
|
||||
cp -a --reflink=auto -t "./rootImage/${target}" "${source}"
|
||||
|
@ -44,7 +41,6 @@ in pkgs.stdenv.mkDerivation {
|
|||
|
||||
grub-script-check ./rootImage/boot/grub/grub.cfg
|
||||
|
||||
xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths
|
||||
(
|
||||
GLOBIGNORE=".:.."
|
||||
shopt -u dotglob
|
||||
|
@ -56,9 +52,6 @@ in pkgs.stdenv.mkDerivation {
|
|||
|
||||
${copyEris}
|
||||
|
||||
# Also include a manifest of the closures in a format suitable for nix-store --load-db
|
||||
cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration
|
||||
|
||||
# Make a crude approximation of the size of the target image.
|
||||
# If the script starts failing, increase the fudge factors here.
|
||||
numInodes=$(find ./rootImage | wc -l)
|
||||
|
|
Loading…
Reference in New Issue