From 8fd6cb720cb04039a3232437f7ff0234ee7b7d7c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 22 Dec 2025 06:19:45 +0000 Subject: [PATCH] import OL rust-bootupd-0.2.31-1.el10_1 --- .gitignore | 4 +- .rust-bootupd.metadata | 2 - ...to-use-an-already-mounted-ESP-at-the.patch | 51 ------- SPECS/rust-bootupd.spec => rust-bootupd.spec | 144 ++++++++++++------ sources | 2 + 5 files changed, 101 insertions(+), 102 deletions(-) delete mode 100644 .rust-bootupd.metadata delete mode 100644 SOURCES/0001-install-attempt-to-use-an-already-mounted-ESP-at-the.patch rename SPECS/rust-bootupd.spec => rust-bootupd.spec (51%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 609f4d7..ab96734 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/bootupd-0.2.28-vendor.tar.zstd -SOURCES/bootupd-0.2.28.tar.zstd +bootupd-0.2.31-vendor.tar.zstd +bootupd-0.2.31.crate diff --git a/.rust-bootupd.metadata b/.rust-bootupd.metadata deleted file mode 100644 index f398a5a..0000000 --- a/.rust-bootupd.metadata +++ /dev/null @@ -1,2 +0,0 @@ -5d0158b7862df708674da66de41c764e59ea4710 SOURCES/bootupd-0.2.28-vendor.tar.zstd -c53785cbafd7bc1a3da45feccd3a53ed3bfd7400 SOURCES/bootupd-0.2.28.tar.zstd 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/rust-bootupd.spec similarity index 51% rename from SPECS/rust-bootupd.spec rename to rust-bootupd.spec index db98138..a4ad61e 100644 --- a/SPECS/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -1,21 +1,27 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.8.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + %bcond_without check %global crate bootupd Name: rust-%{crate} -Version: 0.2.28 -Release: 3%{?dist} +Version: 0.2.31 +Release: %autorelease 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 @@ -59,18 +65,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,64 +80,113 @@ sed -i -e '/https:\/\//d' cargo-vendor.txt %{__make} install-systemd-unit DESTDIR=%{?buildroot} INSTALL="%{__install} -p" %changelog -* Wed Feb 12 2025 Joseph Marrero - 0.2.27-3 -- spec: remove ExcludeArch ix86 as this is c9s - Resolves: #RHEL-77736, #RHEL-79091 +## START: Generated by rpmautospec +* Tue Dec 02 2025 Huijing Hei - 0.2.31-1 +- Update to 0.2.31 -* Wed Feb 12 2025 Joseph Marrero - 0.2.27-2 -- Add git to the build requires - Resolves: #RHEL-77736, #RHEL-79091 +* Thu Aug 21 2025 Huijing Hei - 0.2.29-1 +- Update to 0.2.29 -* Wed Feb 12 2025 Joseph Marrero - 0.2.27-1 -- https://github.com/coreos/bootupd/releases/tag/v0.2.27 - Resolves: #RHEL-77736 +* Thu Jun 26 2025 Huijing Hei - 0.2.28-2 +- Backport the PR that will use an already mounted ESP for installation + +* Thu Jun 26 2025 Huijing Hei - 0.2.28-1 +- Update to 0.2.28 + +* Wed Feb 12 2025 Joseph Marrero Corchado - 0.2.27-2 +- spec: Add BR on git + +* Wed Feb 12 2025 Colin Walters - 0.2.27-1 +- Update to 0.2.27 * Thu Dec 12 2024 HuijingHei - 0.2.25-1 -- new version +- https://github.com/coreos/bootupd/releases/tag/v0.2.25 + Resolves: RHEL-71041 + +* Tue Oct 29 2024 Troy Dawson - 0.2.19-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 0.2.19-2 +- Bump release for June 2024 mass rebuild * Fri May 17 2024 Joseph Marrero - 0.2.19-1 - https://github.com/coreos/bootupd/releases/tag/v0.2.19 - Resolves: RHEL-35887 + Resolves: RHEL-35889 -* Thu Feb 22 2024 Joseph Marrero - 0.2.18-1 -- https://github.com/coreos/bootupd/releases/tag/v0.2.18 - backport patch to support GRUB console.cfg - Resolves: RHEL-26439 +* Thu Feb 01 2024 Yaakov Selkowitz - 0.2.17-4 +- Update Rust macro usage -* Tue Dec 19 2023 Joseph Marrero - 0.2.17-1 +* Fri Jan 26 2024 Fedora Release Engineering - 0.2.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Dec 19 2023 Colin Walters - 0.2.17-2 - https://github.com/coreos/bootupd/releases/tag/v0.2.17 - Resolves: RHEL-14388 - -* Fri Dec 15 2023 Huijing Hei - 0.2.16-4 -- Sync spec with upstream - Related: https://issues.redhat.com/browse/RHEL-14388 - -* Wed Dec 13 2023 Colin Walters - 0.2.16-3 -- Build on all architectures - Related: https://issues.redhat.com/browse/RHEL-14388 * Wed Dec 13 2023 Colin Walters - 0.2.16-2 -- Update to 0.2.16 - Related: https://issues.redhat.com/browse/RHEL-14388 +- https://github.com/coreos/bootupd/releases/tag/v0.2.16 * Tue Nov 28 2023 Colin Walters - 0.2.15-2 - https://github.com/coreos/bootupd/releases/tag/v0.2.15 - Related: https://issues.redhat.com/browse/RHEL-14388 + +* Mon Nov 20 2023 Colin Walters - 0.2.14-2 +- https://github.com/coreos/bootupd/releases/tag/v0.2.14 + +* Tue Nov 14 2023 Yaakov Selkowitz - 0.2.13-4 +- Fix RHEL build + +* Fri Nov 10 2023 Colin Walters - 0.2.13-3 +- Backport patch for not having separate /boot + +* Thu Nov 02 2023 Colin Walters - 0.2.13-2 +- Rebase to 0.2.13 + +* Mon Oct 23 2023 Colin Walters - 0.2.12-4 +- Install static configs * Fri Oct 20 2023 Colin Walters - 0.2.12-2 - https://github.com/coreos/bootupd/releases/tag/v0.2.12 -* Tue Sep 19 2023 Colin Walters - 0.2.11-2 -- https://github.com/coreos/bootupd/releases/tag/v0.2.11 - Resolves: https://issues.redhat.com/browse/RHEL-5273 +* Fri Oct 06 2023 Colin Walters - 0.2.11-5 +- Enable ppc64le, it is supported now -* Mon Aug 01 2022 Colin Walters - 0.2.7-2 +* Sat Sep 30 2023 Fabio Valentini - 0.2.11-4 +- Updates for the latest Rust packaging and license tag / SPDX guidelines. + +* Tue Sep 19 2023 Colin Walters - 0.2.11-3 +- https://github.com/coreos/bootupd/releases/tag/v0.2.11 + +* Mon Sep 11 2023 Colin Walters - 0.2.10-2 +- https://github.com/coreos/bootupd/releases/tag/v0.2.10 + +* Fri Jul 21 2023 Fedora Release Engineering - 0.2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Oct 18 2022 Colin Walters - 0.2.8-3 +- Update to v0.2.8 + +* Fri Jul 29 2022 Colin Walters - 0.2.7-2 - https://github.com/coreos/bootupd/releases/tag/v0.2.7 +* Sat Jul 23 2022 Fedora Release Engineering - 0.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Feb 15 2022 Zbigniew Jędrzejewski-Szmek - 0.2.6-4 +- Rebuild with package notes + +* Tue Feb 15 2022 Zbigniew Jędrzejewski-Szmek - 0.2.6-3 +- Rebuild with package notes + +* Fri Jan 21 2022 Fedora Release Engineering - 0.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Sep 16 2021 Luca BRUNO - 0.2.6-1 - New upstream version https://github.com/coreos/bootupd/releases/tag/v0.2.6 +* Tue Sep 14 2021 Sahana Prasad - 0.2.5-5 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 0.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild @@ -174,3 +223,4 @@ sed -i -e '/https:\/\//d' cargo-vendor.txt * Fri Sep 11 2020 Colin Walters - 0.1.0-3 - Initial package +## END: Generated by rpmautospec diff --git a/sources b/sources new file mode 100644 index 0000000..773c8f4 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (bootupd-0.2.31-vendor.tar.zstd) = 7af4202448a3336c818c0c42a81d0da3806ce57b710d9570e6800a7414150a3c96d3e7b66417cfef776f106dbdce3660768f725606f908be9153d1feb643192d +SHA512 (bootupd-0.2.31.crate) = d05bf21f904e8443b2271f80f7f3b909d5c4607379cfdf4607b8595b5153de6e702a366cd123771e9e81df7f889b568686357fee4af5bf6e73689c00555db16f