diff --git a/.gitignore b/.gitignore index 60802cc..e1fbc10 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /bootupd-0.2.17-vendor.tar.zstd /bootupd-0.2.18.crate /bootupd-0.2.18-vendor.tar.zstd +/bootupd-0.2.19-vendor.tar.zstd +/bootupd-0.2.19.crate diff --git a/0001-grub2-source-in-a-console.cfg-file-if-exists.patch b/0001-grub2-source-in-a-console.cfg-file-if-exists.patch deleted file mode 100644 index 3d6681b..0000000 --- a/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/rust-bootupd.spec b/rust-bootupd.spec index 69f0028..c593f61 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -4,7 +4,7 @@ %global crate bootupd Name: rust-%{crate} -Version: 0.2.18 +Version: 0.2.19 Release: 1%{?dist} Summary: Bootloader updater @@ -13,8 +13,6 @@ 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 - BuildRequires: make BuildRequires: openssl-devel %if 0%{?rhel} && !0%{?eln} @@ -72,6 +70,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 diff --git a/sources b/sources index 4166d14..9cb7d28 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootupd-0.2.18.crate) = 867579ca1978453c14761023abb3ab5fd6d5fffc721e1544d55d5b4e14d5ba374fcf5ed7a53b45d176c3853fb1c0dd715fbd6e7d3652e6ad24ee0de6376a634b -SHA512 (bootupd-0.2.18-vendor.tar.zstd) = c194054b14d8038dc06d4cfa7f4138a0b1a1b5f45aab09df402e55d3fe912fd91f43306dae44878edcfab03196acf3b4d656c66cb8aaa4638a6269b922d3dca7 +SHA512 (bootupd-0.2.19-vendor.tar.zstd) = bd4df9a6e959212d3c48c90a5ef02904fc3d1db5ef50bbc98ce235f3f624316a01814d9c9605b64ca986aa65a984296fc0ffb83e683d6f220ba31ba05785b28c +SHA512 (bootupd-0.2.19.crate) = 286309334b935620a004743631c0bb040c8416ce83284b2f5ad1db04918736f40d7eb68a84bef2927cad7fe5efe13946b1e620e22aec9a428a13d10cbda0231e