From 5cde77109a868908415de95efe77c87da5bb2a85 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 11:46:45 +0000 Subject: [PATCH] import CS rust-bootupd-0.2.18-1.el9 --- .gitignore | 4 +- .rust-bootupd.metadata | 4 +- ...urce-in-a-console.cfg-file-if-exists.patch | 31 ++++++++++++ SPECS/rust-bootupd.spec | 47 ++++++++++++++++--- 4 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 SOURCES/0001-grub2-source-in-a-console.cfg-file-if-exists.patch diff --git a/.gitignore b/.gitignore index 9e09560..14c8d70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/bootupd-0.2.7-vendor.tar.gz -SOURCES/bootupd-0.2.7.crate +SOURCES/bootupd-0.2.18-vendor.tar.zstd +SOURCES/bootupd-0.2.18.crate diff --git a/.rust-bootupd.metadata b/.rust-bootupd.metadata index 7cdd700..b59788b 100644 --- a/.rust-bootupd.metadata +++ b/.rust-bootupd.metadata @@ -1,2 +1,2 @@ -517b22e10b8ea25bfae434d8ae4cfeb8bfc37baa SOURCES/bootupd-0.2.7-vendor.tar.gz -4105365556ce4bd93d88bf85a9b47ba970160927 SOURCES/bootupd-0.2.7.crate +cca30f4f8451b627534258f7c23fa360cec45b4a SOURCES/bootupd-0.2.18-vendor.tar.zstd +3746d3d9ce696228515b3bc400811c55ec8ae515 SOURCES/bootupd-0.2.18.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 new file mode 100644 index 0000000..3d6681b --- /dev/null +++ b/SOURCES/0001-grub2-source-in-a-console.cfg-file-if-exists.patch @@ -0,0 +1,31 @@ +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 2589925..69f0028 100644 --- a/SPECS/rust-bootupd.spec +++ b/SPECS/rust-bootupd.spec @@ -4,17 +4,17 @@ %global crate bootupd Name: rust-%{crate} -Version: 0.2.7 -Release: 2%{?dist} +Version: 0.2.18 +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.gz +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 -# For now, see upstream -ExclusiveArch: x86_64 aarch64 BuildRequires: make BuildRequires: openssl-devel %if 0%{?rhel} && !0%{?eln} @@ -41,11 +41,11 @@ License: ASL 2.0 %{_bindir}/bootupctl %{_libexecdir}/bootupd %{_unitdir}/* +%{_prefix}/lib/bootupd/grub2-static/ %prep %autosetup -n %{crate}-%{version} -p1 -mkdir vendor -tar -xv -C vendor -f %{SOURCE1} +tar -xv -f %{SOURCE1} mkdir -p .cargo cat >.cargo/config << EOF [source.crates-io] @@ -60,6 +60,7 @@ EOF %install %make_install INSTALL="install -p -c" +make install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p" %post -n %{crate} %systemd_post bootupd.service bootupd.socket @@ -71,6 +72,38 @@ EOF %systemd_postun bootupd.service bootupd.socket %changelog +* 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 + +* Tue Dec 19 2023 Joseph Marrero - 0.2.17-1 +- 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 + +* 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 + +* 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 + * Mon Aug 01 2022 Colin Walters - 0.2.7-2 - https://github.com/coreos/bootupd/releases/tag/v0.2.7