Merge pull request #986 from HuijingHei/add-versions

Add `versions` to `ContentMetadata`

Author: HuijingHei

Cargo.lock

@@ -46,6 +46,7 @@ rustix = { version = "1.0.8", features = ["process", "fs"] }
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
 tempfile = "^3.21"
+uapi-version = "0.4.0"
 widestring = "1.2.0"
 walkdir = "2.3.2"
 signal-hook-registry = "1.4.6"

Cargo.toml

@@ -69,6 +69,7 @@ pub fn find_colocated_esps(devices: &Vec<String>) -> Result<Option<Vec<String>>>
 }
 
 /// Find bios_boot partition on the same device
+#[cfg(any(target_arch = "x86_64", target_arch = "powerpc64"))]
 pub fn get_bios_boot_partition(device: &str) -> Result<Option<String>> {
     const BIOS_BOOT_TYPE_GUID: &str = "21686148-6449-6E6F-744E-656564454649";
     let device_info = bootc_internal_blockdev::partitions_of(Utf8Path::new(device))?;
@@ -83,6 +84,7 @@ pub fn get_bios_boot_partition(device: &str) -> Result<Option<String>> {
 }
 
 /// Find all bios_boot partitions on the devices
+#[cfg(any(target_arch = "x86_64", target_arch = "powerpc64"))]
 pub fn find_colocated_bios_boot(devices: &Vec<String>) -> Result<Option<Vec<String>>> {
     // look for all bios_boot parts on those devices
     let mut bios_boots = Vec::new();

src/blockdev.rs

@@ -145,6 +145,7 @@ fn get_static_config_meta() -> Result<ContentMetadata> {
     let self_meta = ContentMetadata {
         timestamp: self_bin_meta.modified()?.into(),
         version: crate_version!().into(),
+        versions: None,
     };
     Ok(self_meta)
 }
@@ -154,7 +155,7 @@ type Components = BTreeMap<&'static str, Box<dyn Component>>;
 #[allow(clippy::box_default)]
 /// Return the set of known components; if `auto` is specified then the system
 /// filters to the target booted state.
-pub(crate) fn get_components_impl(auto: bool) -> Components {
+pub(crate) fn get_components_impl(_auto: bool) -> Components {
     let mut components = BTreeMap::new();
 
     fn insert_component(components: &mut Components, component: Box<dyn Component>) {
@@ -163,7 +164,7 @@ pub(crate) fn get_components_impl(auto: bool) -> Components {
 
     #[cfg(target_arch = "x86_64")]
     {
-        if auto {
+        if _auto {
             let is_efi_booted = crate::efi::is_efi_booted().unwrap();
             log::info!(
                 "System boot method: {}",

src/bootupd.rs

@@ -167,6 +167,7 @@ pub(crate) fn query_adopt_state() -> Result<Option<Adoptable>> {
         let meta = ContentMetadata {
             timestamp: coreos_aleph.ts,
             version: coreos_aleph.aleph.version,
+            versions: None,
         };
         log::trace!("Adoptable: {:?}", &meta);
         return Ok(Some(Adoptable {
@@ -183,6 +184,7 @@ pub(crate) fn query_adopt_state() -> Result<Option<Adoptable>> {
         let meta = ContentMetadata {
             timestamp,
             version: "unknown".to_string(),
+            versions: None,
         };
         return Ok(Some(Adoptable {
             version: meta,

src/component.rs

@@ -28,7 +28,7 @@ use crate::model::*;
 use crate::ostreeutil;
 use crate::util;
 use crate::{blockdev, filetree, grubconfigs};
-use crate::{component::*, packagesystem};
+use crate::{component::*, packagesystem::*};
 
 /// Well-known paths to the ESP that may have been mounted external to us.
 pub(crate) const ESP_MOUNTS: &[&str] = &["boot/efi", "efi", "boot"];
@@ -441,6 +441,7 @@ impl Component for Efi {
         let efilib_path = sysroot_path.join(EFILIB);
         let meta = if efilib_path.exists() {
             let mut packages = Vec::new();
+            let mut modules_vec: Vec<Module> = vec![];
             let sysroot_dir = Dir::open_ambient_dir(sysroot_path, cap_std::ambient_authority())?;
             let efi_components = get_efi_component_from_usr(&sysroot_path, EFILIB)?;
             if efi_components.len() == 0 {
@@ -454,13 +455,19 @@ impl Component for Efi {
                     .current_dir(format!("/proc/self/fd/{}", sysroot_dir.as_raw_fd()))
                     .run()?;
                 packages.push(format!("{}-{}", efi.name, efi.version));
+                modules_vec.push(Module {
+                    name: efi.name,
+                    rpm_evr: efi.version,
+                });
             }
+            modules_vec.sort_unstable();
 
             // change to now to workaround https://github.com/coreos/bootupd/issues/933
             let timestamp = std::time::SystemTime::now();
             ContentMetadata {
                 timestamp: chrono::DateTime::<Utc>::from(timestamp),
                 version: packages.join(","),
+                versions: Some(modules_vec),
             }
         } else {
             let ostreebootdir = sysroot_path.join(ostreeutil::BOOT_PREFIX);
@@ -493,7 +500,7 @@ impl Component for Efi {
                     f.insert_str(0, "/boot/efi/EFI/");
                     f
                 });
-                packagesystem::query_files(sysroot, files)?
+                query_files(sysroot, files)?
             } else {
                 anyhow::bail!("Failed to find {ostreebootdir}");
             }
@@ -707,8 +714,8 @@ fn find_file_recursive<P: AsRef<Path>>(dir: P, target_file: &str) -> Result<Vec<
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct EFIComponent {
-    name: String,
-    version: String,
+    pub name: String,
+    pub version: String,
     path: Utf8PathBuf,
 }
 

src/efi.rs

@@ -9,6 +9,8 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::collections::BTreeMap;
 
+use crate::packagesystem::*;
+
 /// The directory where updates are stored
 pub(crate) const BOOTUPD_UPDATES_DIR: &str = "usr/lib/bootupd/updates";
 
@@ -19,11 +21,17 @@ pub(crate) struct ContentMetadata {
     pub(crate) timestamp: DateTime<Utc>,
     /// Human readable version number, like ostree it is not ever parsed, just displayed
     pub(crate) version: String,
+    /// Transfer version into Module struct list
+    pub(crate) versions: Option<Vec<Module>>,
 }
 
 impl ContentMetadata {
     pub(crate) fn can_upgrade_to(&self, target: &Self) -> Ordering {
-        crate::packagesystem::compare_package_versions(&self.version, &target.version)
+        if let (Some(self_versions), Some(target_versions)) = (&self.versions, &target.versions) {
+            compare_package_slices(self_versions, target_versions)
+        } else {
+            compare_package_versions(&self.version, &target.version)
+        }
     }
 }
 
@@ -128,10 +136,44 @@ mod test {
         let a = ContentMetadata {
             timestamp: t,
             version: "grub2-efi-ia32-1:2.12-21.fc41.x86_64,grub2-efi-x64-1:2.12-21.fc41.x86_64,shim-ia32-15.8-3.x86_64,shim-x64-15.8-3.x86_64".into(),
+            versions: None,
         };
         let b = ContentMetadata {
             timestamp: t + Duration::try_seconds(1).unwrap(),
             version: "grub2-efi-ia32-1:2.12-28.fc41.x86_64,grub2-efi-x64-1:2.12-28.fc41.x86_64,shim-ia32-15.8-3.x86_64,shim-x64-15.8-3.x86_64".into(),
+            versions: None,
+        };
+        assert_eq!(a.can_upgrade_to(&b), Ordering::Less); // means upgradable
+        assert_eq!(b.can_upgrade_to(&a), Ordering::Greater);
+
+        // Compare versions if it is not none
+        let a = ContentMetadata {
+            timestamp: t,
+            version: "test".into(),
+            versions: Some(vec![
+                Module {
+                    name: "grub2".into(),
+                    rpm_evr: "1:2.12-21.fc41".into(),
+                },
+                Module {
+                    name: "shim".into(),
+                    rpm_evr: "15.8-3".into(),
+                },
+            ]),
+        };
+        let b = ContentMetadata {
+            timestamp: t + Duration::try_seconds(1).unwrap(),
+            version: "test".into(),
+            versions: Some(vec![
+                Module {
+                    name: "grub2".into(),
+                    rpm_evr: "1:2.12-28.fc41".into(),
+                },
+                Module {
+                    name: "shim".into(),
+                    rpm_evr: "15.8-3".into(),
+                },
+            ]),
         };
         assert_eq!(a.can_upgrade_to(&b), Ordering::Less); // means upgradable
         assert_eq!(b.can_upgrade_to(&a), Ordering::Greater);
@@ -147,6 +189,26 @@ mod test {
             efi.meta.version,
             "grub2-efi-x64-1:2.04-23.fc32.x86_64,shim-x64-15-8.x86_64"
         );
+        assert_eq!(efi.meta.versions, None);
+
+        // Test the new versions
+        let data = include_str!("../tests/fixtures/example-state-versions-v0.json");
+        let state: SavedState = serde_json::from_str(data)?;
+        let efi = state.installed.get("EFI").expect("EFI");
+        assert_eq!(efi.meta.version, "grub2-1:2.12-41.fc44,shim-15.8-4");
+        assert_eq!(
+            efi.meta.versions,
+            Some(vec![
+                Module {
+                    name: "grub2".into(),
+                    rpm_evr: "1:2.12-41.fc44".into(),
+                },
+                Module {
+                    name: "shim".into(),
+                    rpm_evr: "15.8-4".into(),
+                },
+            ])
+        );
         Ok(())
     }
 
@@ -160,6 +222,7 @@ mod test {
             efi.installed.version,
             "grub2-efi-x64-1:2.04-23.fc32.x86_64,shim-x64-15-8.x86_64"
         );
+        assert_eq!(efi.installed.versions, None);
         Ok(())
     }
 }

src/model.rs

@@ -49,6 +49,7 @@ impl ContentMetadata01 {
         NewContentMetadata {
             timestamp,
             version: self.version,
+            versions: None,
         }
     }
 }