Spectrum Development

Download

devel@spectrum-os.org

January 2022

1 participants
2 discussions

[PATCH] use statically linked cryptsetup in initramfs
by Yureka 16 Feb '22

16 Feb '22

--- host/initramfs/default.nix | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/host/initramfs/default.nix b/host/initramfs/default.nix index ba6ede2..91e598f 100644 --- a/host/initramfs/default.nix +++ b/host/initramfs/default.nix @@ -2,15 +2,38 @@ { lib, stdenv, runCommand, writeReferencesToFile, pkgsStatic , busybox, cpio, cryptsetup, linux, lvm2 +, fetchpatch }: -let - cryptsetup' = cryptsetup; -in let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; - cryptsetup = cryptsetup'.override { lvm2 = lvm2.override { udev = null; }; }; + # https://github.com/NixOS/nixpkgs/pull/148948 + cryptsetup = (pkgsStatic.cryptsetup.override { + lvm2 = (pkgsStatic.lvm2.override { + udev = null; + }).overrideAttrs (old: { + patches = (old.patches or []) ++ [ + (fetchpatch { + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/bf8b0d818a6c5fa65f318603756…"; + sha256 = "sha256-t67Osvcn92R7q9V+KDW+SyJDmajzVbnTPONlokcBU9U="; + }) + ]; + configureFlags = old.configureFlags ++ [ "--enable-static_link" ]; + makeFlags = old.makeFlags ++ [ "libdm.device-mapper" ]; + installPhase = '' + install -D -t $out/lib libdm/ioctl/libdevmapper.a + make -C libdm install_include + make -C libdm install_pkgconfig + ''; + outputs = [ "out" ]; + }); + }).overrideAttrs (old: { + NIX_LDFLAGS = ""; + configureFlags = old.configureFlags ++ [ + "--enable-static-cryptsetup" + ]; + }); packages = [ cryptsetup pkgsStatic.mdevd pkgsStatic.execline -- 2.34.0

2 1

[PATCH] installer: more closely match grub-install
by Alyssa Ross 12 Jan '22

12 Jan '22

The main motivation here is that I noticed we're installing a lot of *.module files that grub-install didn't include. After this change, we're still differing from what grub-install does in the following ways: • Locale files are still not included • grub/x86_64-efi/core.efi or grub/x86_64-efi/grub.efi are not included. I'm not sure where those executables come from, but they don't seem to be required. • We're still not creating a grubenv file, which should be fine because there's no data that might need to be persisted anyway. --- installer/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/installer/default.nix b/installer/default.nix index 9fc7493..f7e84ac 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -24,10 +24,22 @@ let esp = runCommand "esp.img" { nativeBuildInputs = [ grub libfaketime dosfstools mtools ]; + # Definition copied from util/grub-install-common.c. + # Last checked: GRUB 2.06 + pkglib_DATA = [ + "efiemu32.o" "efiemu64.o" "moddep.lst" "command.lst" "fs.lst" "partmap.lst" + "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" "modinfo.sh" + ]; } '' - install -D ${grubCfg} files/grub/grub.cfg - cp -r ${grub}/lib/grub/${grub.grubTarget} files/grub/ - cp ${grub}/share/grub/unicode.pf2 files/grub/ + mkdir -p files/grub/${grub.grubTarget} + cp ${grubCfg} files/grub/grub.cfg + cp ${grub}/lib/grub/${grub.grubTarget}/*.mod files/grub/${grub.grubTarget} + for file in $pkglib_DATA; do + path="${grub}/lib/grub/${grub.grubTarget}/$file" + ! [ -e "$path" ] || cp "$path" files/grub/${grub.grubTarget} + done + + install -D ${grub}/share/grub/unicode.pf2 files/grub/fonts/unicode.pf2 grub-mkimage -o grubx64.efi -p "(hd0,gpt1)/grub" -O ${grub.grubTarget} part_gpt fat install -D grubx64.efi files/EFI/BOOT/BOOTX64.EFI base-commit: 907294e4a85e77e5db116a73ecfdf9a406be663b -- 2.33.0

1 0