twoliter: Use embedded sbkeys script

Author: ecpullen

twoliter/build.rs

@@ -32,6 +32,7 @@ fn main() {
     paths.copy_file("rpm2img");
     paths.copy_file("rpm2kmodkit");
     paths.copy_file("rpm2migrations");
+    paths.copy_file("generate-local-sbkeys");
 
     // Create tarball in memory.
     println!("Starting tarball creation at {:?}", SystemTime::now());

twoliter/embedded/Makefile.toml

@@ -663,7 +663,7 @@ echo "No Secure Boot signing profile found in ${profile}." >&2
 echo "Generating local keys." >&2
 
 mkdir -p "${BUILDSYS_SBKEYS_PROFILE_DIR}"
-${BUILDSYS_SBKEYS_DIR}/generate-local-sbkeys \
+${TWOLITER_TOOLS_DIR}/generate-local-sbkeys \
   --sdk-image "${TLPRIVATE_SDK_IMAGE}" \
   --output-dir "${BUILDSYS_SBKEYS_PROFILE_DIR}"
 '''

twoliter/src/cmd/build.rs

@@ -83,12 +83,6 @@ impl BuildVariant {
             // Create a sbkeys directory in the main project
             debug!("sbkeys dir not found. Creating a temporary directory");
             fs::create_dir_all(&sbkeys_dir)?;
-            sdk_container
-                .cp_out(
-                    Path::new("twoliter/alpha/sbkeys/generate-local-sbkeys"),
-                    &sbkeys_dir,
-                )
-                .await?;
         };
 
         // TODO: Remove once models is no longer conditionally compiled.