From 5537e8701bcf01250676f5082aa93beaed419f2e Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 30 Mar 2026 11:02:12 -0400 Subject: [PATCH] import CS rust-bootupd-0.2.31-1.el9 --- .gitignore | 4 +- .rust-bootupd.metadata | 4 +- ...to-use-an-already-mounted-ESP-at-the.patch | 51 ------------------- SPECS/rust-bootupd.spec | 21 +++----- 4 files changed, 12 insertions(+), 68 deletions(-) delete mode 100644 SOURCES/0001-install-attempt-to-use-an-already-mounted-ESP-at-the.patch diff --git a/.gitignore b/.gitignore index 609f4d7..7b93b2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/bootupd-0.2.28-vendor.tar.zstd -SOURCES/bootupd-0.2.28.tar.zstd +SOURCES/bootupd-0.2.31-vendor.tar.zstd +SOURCES/bootupd-0.2.31.crate diff --git a/.rust-bootupd.metadata b/.rust-bootupd.metadata index f398a5a..3b0652f 100644 --- a/.rust-bootupd.metadata +++ b/.rust-bootupd.metadata @@ -1,2 +1,2 @@ -5d0158b7862df708674da66de41c764e59ea4710 SOURCES/bootupd-0.2.28-vendor.tar.zstd -c53785cbafd7bc1a3da45feccd3a53ed3bfd7400 SOURCES/bootupd-0.2.28.tar.zstd +6c67d51045bfd7a91f8dcc18ef8df3740945a9e7 SOURCES/bootupd-0.2.31-vendor.tar.zstd +92f66e9b7133728aac746009411bb4263e7d3e69 SOURCES/bootupd-0.2.31.crate diff --git a/SOURCES/0001-install-attempt-to-use-an-already-mounted-ESP-at-the.patch b/SOURCES/0001-install-attempt-to-use-an-already-mounted-ESP-at-the.patch deleted file mode 100644 index 237db10..0000000 --- a/SOURCES/0001-install-attempt-to-use-an-already-mounted-ESP-at-the.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 593b94a1750c1d71f5a37365633afdd99cfb714b Mon Sep 17 00:00:00 2001 -From: Huijing Hei -Date: Wed, 25 Jun 2025 12:14:02 +0800 -Subject: [PATCH] install: attempt to use an already mounted ESP at the target - -Let's attempt to use an already mounted ESP at the target -dest_root if one is already mounted there in a known ESP location, -if failed, will fallback to mount ESP partition of the device. - -See https://github.com/coreos/coreos-assembler/pull/4161 ---- - src/efi.rs | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/src/efi.rs b/src/efi.rs -index 1adc3d6..b8fc24c 100644 ---- a/src/efi.rs -+++ b/src/efi.rs -@@ -345,14 +345,22 @@ impl Component for Efi { - let srcdir_name = component_updatedirname(self); - let ft = crate::filetree::FileTree::new_from_dir(&src_root.sub_dir(&srcdir_name)?)?; - -- // Using `blockdev` to find the partition instead of partlabel because -- // we know the target install toplevel device already. -- let esp_device = blockdev::get_esp_partition(device)? -- .ok_or_else(|| anyhow::anyhow!("Failed to find ESP device"))?; -- -- let destpath = &self.ensure_mounted_esp(Path::new(dest_root), Path::new(&esp_device))?; -+ // Let's attempt to use an already mounted ESP at the target -+ // dest_root if one is already mounted there in a known ESP location. -+ let destpath = if let Some(destdir) = self.get_mounted_esp(Path::new(dest_root))? { -+ destdir -+ } else { -+ // Using `blockdev` to find the partition instead of partlabel because -+ // we know the target install toplevel device already. -+ if device.is_empty() { -+ anyhow::bail!("Device value not provided"); -+ } -+ let esp_device = blockdev::get_esp_partition(device)? -+ .ok_or_else(|| anyhow::anyhow!("Failed to find ESP device"))?; -+ self.mount_esp_device(Path::new(dest_root), Path::new(&esp_device))? -+ }; - -- let destd = &openat::Dir::open(destpath) -+ let destd = &openat::Dir::open(&destpath) - .with_context(|| format!("opening dest dir {}", destpath.display()))?; - validate_esp_fstype(destd)?; - --- -2.49.0 - diff --git a/SPECS/rust-bootupd.spec b/SPECS/rust-bootupd.spec index db98138..50876a8 100644 --- a/SPECS/rust-bootupd.spec +++ b/SPECS/rust-bootupd.spec @@ -3,20 +3,18 @@ %global crate bootupd Name: rust-%{crate} -Version: 0.2.28 -Release: 3%{?dist} +Version: 0.2.31 +Release: 1%{?dist} Summary: Bootloader updater License: Apache-2.0 URL: https://github.com/coreos/bootupd -Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.tar.zstd +Source0: %{crates_source} Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd %if 0%{?fedora} || 0%{?rhel} >= 10 ExcludeArch: %{ix86} %endif -Patch0: 0001-install-attempt-to-use-an-already-mounted-ESP-at-the.patch - BuildRequires: git # For now, see upstream BuildRequires: make @@ -59,18 +57,12 @@ License: Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND BSD-3-Clause %{_unitdir}/bootloader-update.service %prep -%autosetup -n %{crate}-%{version} -p1 -Sgit -a1 -# Default -v vendor config doesn't support non-crates.io deps (i.e. git) -cp .cargo/vendor-config.toml . -%cargo_prep -N -cat vendor-config.toml >> .cargo/config.toml -rm vendor-config.toml +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor %build %cargo_build %cargo_vendor_manifest -# https://pagure.io/fedora-rust/rust-packaging/issue/33 -sed -i -e '/https:\/\//d' cargo-vendor.txt %cargo_license_summary %{cargo_license} > LICENSE.dependencies @@ -80,6 +72,9 @@ sed -i -e '/https:\/\//d' cargo-vendor.txt %{__make} install-systemd-unit DESTDIR=%{?buildroot} INSTALL="%{__install} -p" %changelog +* Thu Aug 21 2025 HuijingHei - 0.2.29-1 + Resolves: #RHEL-110494 + * Wed Feb 12 2025 Joseph Marrero - 0.2.27-3 - spec: remove ExcludeArch ix86 as this is c9s Resolves: #RHEL-77736, #RHEL-79091