ehmry/sigil
ehmry
/
sigil
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Do not worry about the store closure in make-ext2-fs 

Probably should worry about this.
This commit is contained in:
Ehmry - 2021-03-02 17:45:54 +01:00
parent 85a108bdb3
commit 7376302bcc
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos-modules/genode-core.nix
View File

@ -276,7 +276,7 @@ in {
}; };
storePaths = mkOption { storePaths = mkOption {
type = with types; listOf package; type = with types; listOf path;
description = '' description = ''
Derivations to be included in the Nix store in the generated boot image. Derivations to be included in the Nix store in the generated boot image.
''; '';

7
nixos-modules/lib/make-ext2-fs.nix
View File

@ -2,9 +2,6 @@
let let
grub' = pkgs.buildPackages.grub2_efi; grub' = pkgs.buildPackages.grub2_efi;
sdClosureInfo = pkgs.buildPackages.closureInfo {
rootPaths = config.genode.boot.storePaths;
};
copyEris = lib.strings.concatMapStrings ({ source, target }: '' copyEris = lib.strings.concatMapStrings ({ source, target }: ''
cp -a --reflink=auto -t "./rootImage/${target}" "${source}" cp -a --reflink=auto -t "./rootImage/${target}" "${source}"
@ -44,7 +41,6 @@ in pkgs.stdenv.mkDerivation {
grub-script-check ./rootImage/boot/grub/grub.cfg grub-script-check ./rootImage/boot/grub/grub.cfg
xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths
( (
GLOBIGNORE=".:.." GLOBIGNORE=".:.."
shopt -u dotglob shopt -u dotglob
@ -56,9 +52,6 @@ in pkgs.stdenv.mkDerivation {
${copyEris} ${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. # Make a crude approximation of the size of the target image.
# If the script starts failing, increase the fudge factors here. # If the script starts failing, increase the fudge factors here.
numInodes=$(find ./rootImage | wc -l) numInodes=$(find ./rootImage | wc -l)