extends payload and stage for metadata update

moves content of  input_dir /usr/lib/efi/firmware/<name>/<version>/EFI/boot/efi/

Author: say-paul

src/efi.rs

@@ -9,7 +9,7 @@ use std::os::unix::io::AsRawFd;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-use anyhow::{bail, Context, Result};
+use anyhow::{anyhow, bail, Context, Result};
 use bootc_utils::CommandRunExt;
 use cap_std::fs::Dir;
 use cap_std_ext::cap_std;
@@ -455,39 +455,89 @@ impl Component for Efi {
     }
 
     fn extend_payload(&self, sysroot_path: &str, src_input: &str) -> Result<Option<bool>> {
-        let ostreebootdir = Path::new(sysroot_path).join(ostreeutil::BOOT_PREFIX);
-        let dest_efidir = component_updatedir(sysroot_path, self);
+        let dest_efidir_base = Path::new(sysroot_path).join("usr/lib/efi").join("firmware");
+
+        // Fetch version and release from the source input using query_files
+        let src_input_path = Path::new(src_input);
+        let meta_from_src = packagesystem::query_files(sysroot_path, [src_input_path])
+            .context(format!("Querying RPM metadata for {:?}", src_input_path))?;
+
+        let version_string_part = meta_from_src.version.splitn(2, ',').next()
+            .ok_or_else(|| anyhow!(
+                "RPM query returned an empty or malformed version string (no package name found in '{}').",
+                meta_from_src.version
+            ))?;
+
+        let parts: Vec<&str> = version_string_part.split('-').collect();
+
+        let (pkg_name, version_release_str) = if parts.len() >= 3 {
+            // Successfully extracted package name, version, and release
+            let actual_pkg_name = parts[0];
+            let version_part = parts[parts.len() - 2]; // version, e.g., "1.0"
+            let release_part = parts[parts.len() - 1]
+                .split('.')
+                .next()
+                .unwrap_or(parts[parts.len() - 1]); // release, e.g., "1" from "1.el8.noarch"
+            (
+                actual_pkg_name.to_string(),
+                format!("{}-{}", version_part, release_part),
+            )
+        } else {
+            return Err(anyhow!(
+                "Unexpected RPM version string format: '{}'. Expected at least <pkg_name>-<version>-<release>.",
+                version_string_part
+            ));
+        };
 
-        // move files to staged updates
-        if ostreebootdir.exists() {
-            let cruft = ["loader", "grub2"];
-            for p in cruft.iter() {
-                let p = ostreebootdir.join(p);
-                if p.exists() {
-                    std::fs::remove_dir_all(&p)?;
-                }
-            }
-            // mv src data to /usr/lib_bootupd/updates/EFI
-            let efisrc = ostreebootdir.join(src_input);
-            if !efisrc.exists() {
-                bail!("Failed to find {:?}", &efisrc);
-            }
-            Command::new("mv").args([&efisrc, &dest_efidir]).run()?;
+        let final_dest_efi_path = dest_efidir_base
+            .join(&pkg_name) // add the package name as a directory
+            .join(&version_release_str)
+            .join("EFI/boot/efi");
+
+        // Ensure the destination directory exists
+        std::fs::create_dir_all(&final_dest_efi_path).with_context(|| {
+            format!(
+                "Failed to create destination directory {:?}",
+                &final_dest_efi_path
+            )
+        })?;
+
+        let src_metadata = std::fs::metadata(src_input_path)
+            .with_context(|| format!("Failed to get metadata for {:?}", src_input_path))?;
+
+        if src_metadata.is_dir() {
+            log::debug!(
+                "Copying contents of directory {:?} to {:?}",
+                src_input,
+                &final_dest_efi_path
+            );
+            Command::new("cp")
+                .args([
+                    "-rp",
+                    &format!("{}/.", src_input),
+                    final_dest_efi_path.to_str().unwrap(),
+                ])
+                .run()
+                .with_context(|| {
+                    format!(
+                        "Failed to copy contents of {:?} to {:?}",
+                        src_input, &final_dest_efi_path
+                    )
+                })?;
+        } else if src_metadata.is_file() {
+            log::debug!("Copying file {:?} to {:?}", src_input, &final_dest_efi_path);
+            Command::new("cp")
+                .args(["-p", src_input, final_dest_efi_path.to_str().unwrap()])
+                .run()
+                .with_context(|| {
+                    format!(
+                        "Failed to copy file {:?} to {:?}",
+                        src_input, &final_dest_efi_path
+                    )
+                })?;
+        } else {
+            anyhow::bail!("Unsupported src_input type: {:?}", src_input);
         }
-
-        // canocinal path information parsed
-        let efidir = openat::Dir::open(&dest_efidir)
-            .with_context(|| format!("Opening {}", dest_efidir.display()))?;
-        let files = crate::util::filenames(&efidir)?.into_iter().map(|mut f| {
-            f.insert_str(0, src_input);
-            f
-        });
-
-        // writes EFI.JSON with the timestamp and version
-        let meta =
-            packagesystem::query_files(sysroot_path, files).context("Querying RPM metadata")?;
-        write_update_metadata(sysroot_path, self, &meta)?;
-
         Ok(Some(true))
     }