treewide: simplify subproject names

Lanzatool is renamed to 'tool' and lanzaboote is renamed to 'stub'.
The name of the lanzatool binary is now 'lzbt' standing for
LanZaBooteTool.
This commit is contained in:
nikstur 2023-01-13 22:10:40 +01:00
parent 2fce3c0802
commit 5bb33f3389
7 changed files with 39 additions and 33 deletions

View File

@ -53,7 +53,7 @@
./nix/modules/lanzaboote.nix ./nix/modules/lanzaboote.nix
]; ];
boot.lanzaboote.package = perSystem.config.packages.lanzatool; boot.lanzaboote.package = perSystem.config.packages.tool;
} }
); );
@ -107,15 +107,15 @@
}); });
}; };
lanzabooteCrane = buildRustApp { stubCrane = buildRustApp {
src = craneLib.cleanCargoSource ./rust/stub; src = craneLib.cleanCargoSource ./rust/stub;
target = "x86_64-unknown-uefi"; target = "x86_64-unknown-uefi";
doCheck = false; doCheck = false;
}; };
lanzaboote = lanzabooteCrane.package; stub = stubCrane.package;
lanzatoolCrane = buildRustApp { toolCrane = buildRustApp {
src = ./rust/tool; src = ./rust/tool;
extraArgs = { extraArgs = {
TEST_SYSTEMD = pkgs.systemd; TEST_SYSTEMD = pkgs.systemd;
@ -126,13 +126,9 @@
}; };
}; };
lanzatool-unwrapped = lanzatoolCrane.package; tool = toolCrane.package;
in
{
packages = {
inherit lanzaboote;
lanzatool = pkgs.runCommand "lanzatool" wrappedTool = pkgs.runCommand "lzbt"
{ {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
} '' } ''
@ -140,20 +136,26 @@
# Clean PATH to only contain what we need to do objcopy. Also # Clean PATH to only contain what we need to do objcopy. Also
# tell lanzatool where to find our UEFI binaries. # tell lanzatool where to find our UEFI binaries.
makeWrapper ${lanzatool-unwrapped}/bin/lanzatool $out/bin/lanzatool \ makeWrapper ${tool}/bin/lzbt $out/bin/lzbt \
--set PATH ${lib.makeBinPath [ pkgs.binutils-unwrapped pkgs.sbsigntool ]} \ --set PATH ${lib.makeBinPath [ pkgs.binutils-unwrapped pkgs.sbsigntool ]} \
--set RUST_BACKTRACE full \ --set RUST_BACKTRACE full \
--set LANZABOOTE_STUB ${lanzaboote}/bin/lanzaboote.efi --set LANZABOOTE_STUB ${stub}/bin/lanzaboote_stub.efi
''; '';
in
{
packages = {
inherit stub;
tool = wrappedTool;
lzbt = wrappedTool;
}; };
overlayAttrs = { overlayAttrs = {
inherit (config.packages) lanzatool; inherit (config.packages) tool;
}; };
checks = { checks = {
lanzatool-clippy = lanzatoolCrane.clippy; toolClippy = toolCrane.clippy;
lanzaboote-clippy = lanzabooteCrane.clippy; stubClippy = stubCrane.clippy;
} // (import ./nix/tests/lanzaboote.nix { } // (import ./nix/tests/lanzaboote.nix {
inherit pkgs testPkgs; inherit pkgs testPkgs;
lanzabooteModule = self.nixosModules.lanzaboote; lanzabooteModule = self.nixosModules.lanzaboote;
@ -193,8 +195,8 @@
]; ];
inputsFrom = [ inputsFrom = [
config.packages.lanzaboote config.packages.stub
config.packages.lanzatool config.packages.tool
]; ];
TEST_SYSTEMD = pkgs.systemd; TEST_SYSTEMD = pkgs.systemd;

View File

@ -39,8 +39,8 @@ in
}; };
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.lanzatool; default = pkgs.lzbt;
description = "Lanzatool package"; description = "Lanzaboote tool (lzbt) package";
}; };
}; };
@ -58,7 +58,7 @@ in
${sbctlWithPki}/bin/sbctl enroll-keys --yes-this-might-brick-my-machine ${sbctlWithPki}/bin/sbctl enroll-keys --yes-this-might-brick-my-machine
''} ''}
${cfg.package}/bin/lanzatool install \ ${cfg.package}/bin/lzbt install \
--public-key ${cfg.publicKeyFile} \ --public-key ${cfg.publicKeyFile} \
--private-key ${cfg.privateKeyFile} \ --private-key ${cfg.privateKeyFile} \
--configuration-limit ${toString configurationLimit} \ --configuration-limit ${toString configurationLimit} \

2
rust/stub/Cargo.lock generated
View File

@ -86,7 +86,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "lanzaboote" name = "lanzaboote_stub"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"ed25519-compact", "ed25519-compact",

View File

@ -1,5 +1,5 @@
[package] [package]
name = "lanzaboote" name = "lanzaboote_stub"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
publish = false publish = false

2
rust/tool/Cargo.lock generated
View File

@ -274,7 +274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
[[package]] [[package]]
name = "lanzatool" name = "lanzaboote_tool"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",

View File

@ -1,8 +1,12 @@
[package] [package]
name = "lanzatool" name = "lanzaboote_tool"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
[[bin]]
name = "lzbt"
path = "src/main.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]

View File

@ -110,7 +110,7 @@ pub fn lanzaboote_install(
let test_systemd = systemd_location_from_env()?; let test_systemd = systemd_location_from_env()?;
let test_systemd_stub = format!("{test_systemd}/lib/systemd/boot/efi/linuxx64.efi.stub"); let test_systemd_stub = format!("{test_systemd}/lib/systemd/boot/efi/linuxx64.efi.stub");
let mut cmd = Command::cargo_bin("lanzatool")?; let mut cmd = Command::cargo_bin("lzbt")?;
let output = cmd let output = cmd
.env("LANZABOOTE_STUB", test_systemd_stub) .env("LANZABOOTE_STUB", test_systemd_stub)
.arg("install") .arg("install")