min
/
lanzaboote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix: drop wrapInitrd from flake.nix

This commit is contained in:
Julian Stecklina 2022-11-26 02:21:05 +01:00
parent 691da44610
commit 46452f0e46
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.nix
View File

@ -89,23 +89,6 @@
--set LANZABOOTE_INITRD_STUB ${initrd-stub}/bin/initrd-stub.efi \ --set LANZABOOTE_INITRD_STUB ${initrd-stub}/bin/initrd-stub.efi \
''; '';
# A script that takes an initrd and turns it into a PE image.
wrapInitrd = pkgs.writeShellScriptBin "wrap-initrd" ''
set -eu
STUB=${initrd-stub}/bin/initrd-stub.efi
INITRD=$1
OUT=$2
stub_line=$(objdump -h "$STUB" | tail -2 | head -1)
stub_size=0x$(echo "$stub_line" | awk '{print $3}')
stub_offs=0x$(echo "$stub_line" | awk '{print $4}')
initrd_offs=$((stub_size + stub_offs))
objcopy --add-section .initrd="$INITRD" --change-section-vma .initrd=$(printf 0x%x $initrd_offs) \
"$STUB" "$OUT"
'';
osrel = pkgs.writeText "lanzaboote-osrel" '' osrel = pkgs.writeText "lanzaboote-osrel" ''
NAME=Lanzaboote NAME=Lanzaboote
VERSION="${lanzaboote.version}" VERSION="${lanzaboote.version}"
@ -130,7 +113,7 @@
nixosModules.lanzaboote = import ./nix/lanzaboote.nix; nixosModules.lanzaboote = import ./nix/lanzaboote.nix;
packages.x86_64-linux = { packages.x86_64-linux = {
inherit uefi-run initrd-stub lanzaboote lanzaboote-uki lanzatool wrapInitrd; inherit uefi-run initrd-stub lanzaboote lanzaboote-uki lanzatool;
default = lanzaboote-uki; default = lanzaboote-uki;
}; };
@ -139,7 +122,6 @@
uefi-run uefi-run
lanzatool lanzatool
pkgs.openssl pkgs.openssl
wrapInitrd
(pkgs.sbctl.override { (pkgs.sbctl.override {
databasePath = "pki"; databasePath = "pki";
}) })