From c2a6e884f14d4544e4017ac80a52ec579f722e7c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 30 Sep 2024 16:36:24 +0000 Subject: [PATCH] import CS rust-bootupd-0.2.19-1.el9 --- .gitignore | 4 +- .rust-bootupd.metadata | 4 +- ...urce-in-a-console.cfg-file-if-exists.patch | 31 ----------- SPECS/rust-bootupd.spec | 51 +++++++++++-------- 4 files changed, 33 insertions(+), 57 deletions(-) delete mode 100644 SOURCES/0001-grub2-source-in-a-console.cfg-file-if-exists.patch diff --git a/.gitignore b/.gitignore index 14c8d70..8d3f52f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/bootupd-0.2.18-vendor.tar.zstd -SOURCES/bootupd-0.2.18.crate +SOURCES/bootupd-0.2.19-vendor.tar.zstd +SOURCES/bootupd-0.2.19.crate diff --git a/.rust-bootupd.metadata b/.rust-bootupd.metadata index b59788b..dc0ecbe 100644 --- a/.rust-bootupd.metadata +++ b/.rust-bootupd.metadata @@ -1,2 +1,2 @@ -cca30f4f8451b627534258f7c23fa360cec45b4a SOURCES/bootupd-0.2.18-vendor.tar.zstd -3746d3d9ce696228515b3bc400811c55ec8ae515 SOURCES/bootupd-0.2.18.crate +c9fc8b2e450c11c8e12fb63b7474cddd009f52e5 SOURCES/bootupd-0.2.19-vendor.tar.zstd +11db1d98620000dccf43a2d645b2020b696ae321 SOURCES/bootupd-0.2.19.crate diff --git a/SOURCES/0001-grub2-source-in-a-console.cfg-file-if-exists.patch b/SOURCES/0001-grub2-source-in-a-console.cfg-file-if-exists.patch deleted file mode 100644 index 3d6681b..0000000 --- a/SOURCES/0001-grub2-source-in-a-console.cfg-file-if-exists.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 38b971647d126f9c51545553d2a55cc77ff01d08 Mon Sep 17 00:00:00 2001 -From: Dusty Mabe -Date: Mon, 19 Feb 2024 14:33:17 -0500 -Subject: [PATCH] grub2: source in a console.cfg file if exists - -This will allow users or distro builders place console settings -here that will get picked up on boot. This was discussed as part -of https://github.com/coreos/fedora-coreos-tracker/issues/1671 ---- - src/grub2/grub-static-pre.cfg | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/grub2/grub-static-pre.cfg b/src/grub2/grub-static-pre.cfg -index 7784834..9717cfb 100644 ---- a/src/grub2/grub-static-pre.cfg -+++ b/src/grub2/grub-static-pre.cfg -@@ -38,6 +38,11 @@ elif [ -s $prefix/grubenv ]; then - load_env - fi - -+if [ -f $prefix/console.cfg ]; then -+ # Source in any GRUB console settings if provided by the user/platform -+ source $prefix/console.cfg -+fi -+ - if [ x"${feature_menuentry_id}" = xy ]; then - menuentry_id_option="--id" - else --- -2.43.0 - diff --git a/SPECS/rust-bootupd.spec b/SPECS/rust-bootupd.spec index 69f0028..23dd632 100644 --- a/SPECS/rust-bootupd.spec +++ b/SPECS/rust-bootupd.spec @@ -1,26 +1,24 @@ %bcond_without check -%global __cargo_skip_build 0 %global crate bootupd Name: rust-%{crate} -Version: 0.2.18 +Version: 0.2.19 Release: 1%{?dist} Summary: Bootloader updater -License: ASL 2.0 -URL: https://crates.io/crates/bootupd -Source0: https://github.com/coreos/bootupd/releases/download/v%{version}/bootupd-%{version}.crate -Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.zstd - -Patch0: 0001-grub2-source-in-a-console.cfg-file-if-exists.patch +License: Apache-2.0 +URL: https://github.com/coreos/bootupd +Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate +Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd +# For now, see upstream BuildRequires: make BuildRequires: openssl-devel -%if 0%{?rhel} && !0%{?eln} +%if 0%{?rhel} BuildRequires: rust-toolset %else -BuildRequires: rust-packaging +BuildRequires: cargo-rpm-macros >= 25 %endif BuildRequires: systemd @@ -30,13 +28,23 @@ Bootloader updater} %package -n %{crate} Summary: %{summary} -License: ASL 2.0 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-3-Clause +# MIT +# MIT OR Apache-2.0 +# Unlicense OR MIT +License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT) %{?systemd_requires} %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt %doc README.md %{_bindir}/bootupctl %{_libexecdir}/bootupd @@ -44,23 +52,18 @@ License: ASL 2.0 %{_prefix}/lib/bootupd/grub2-static/ %prep -%autosetup -n %{crate}-%{version} -p1 -tar -xv -f %{SOURCE1} -mkdir -p .cargo -cat >.cargo/config << EOF -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor %build %cargo_build +%cargo_vendor_manifest +%cargo_license_summary +%{cargo_license} > LICENSE.dependencies %install %make_install INSTALL="install -p -c" -make install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p" +%{__make} install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p" %post -n %{crate} %systemd_post bootupd.service bootupd.socket @@ -72,6 +75,10 @@ make install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p" %systemd_postun bootupd.service bootupd.socket %changelog +* Fri May 17 2024 Joseph Marrero - 0.2.19-1 +- https://github.com/coreos/bootupd/releases/tag/v0.2.19 + Resolves: RHEL-35887 + * 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