Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fwupd for openSUSE:Factory checked in at 2023-01-20 17:37:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwupd (Old) and /work/SRC/openSUSE:Factory/.fwupd.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fwupd" Fri Jan 20 17:37:46 2023 rev:58 rq:1059490 version:1.8.9 Changes: -------- --- /work/SRC/openSUSE:Factory/fwupd/fwupd.changes 2023-01-06 17:05:31.740172374 +0100 +++ /work/SRC/openSUSE:Factory/.fwupd.new.32243/fwupd.changes 2023-01-20 17:37:48.912234163 +0100 @@ -1,0 +2,6 @@ +Wed Jan 18 17:13:29 UTC 2023 - Michal Suchanek <msucha...@suse.com> + +- Fix error generating grub.cfg when an update is available. + + uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch + +------------------------------------------------------------------- New: ---- uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwupd.spec ++++++ --- /var/tmp/diff_new_pack.QqFOTn/_old 2023-01-20 17:37:49.696238500 +0100 +++ /var/tmp/diff_new_pack.QqFOTn/_new 2023-01-20 17:37:49.700238521 +0100 @@ -55,6 +55,8 @@ Patch3: harden_fwupd-offline-update.service.patch # PATCH-FEATURE-OPENSUSE harden_fwupd-refresh.service.patch -- Harden services Patch4: harden_fwupd-refresh.service.patch +# PATCH_FIX_UPSTREAM uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch -- https://github.com/fwupd/fwupd/issues/5424 +Patch5: uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch BuildRequires: dejavu-fonts BuildRequires: fdupes ++++++ fwupd-1.8.9.obscpio ++++++ /work/SRC/openSUSE:Factory/fwupd/fwupd-1.8.9.obscpio /work/SRC/openSUSE:Factory/.fwupd.new.32243/fwupd-1.8.9.obscpio differ: char 191821, line 5741 ++++++ uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch ++++++ >From 9065f50057cb0e9a1609e44882740ba70d98c2a6 Mon Sep 17 00:00:00 2001 From: Michal Suchanek <msucha...@suse.de> Date: Wed, 18 Jan 2023 16:07:05 +0100 Subject: [PATCH] uefi-capsule: Do not call grub2-probe without arguments commit 684bc0381 ("trivial: fix various shellcheck warnings") adds call to ${grub_probe} without any argument which causes grub2-probe to return an error, and generating grub configuration fails. Add --version argument to avoid the error, and redierct the output to /dev/null so that it's not included in the grub configuration file. The commit also adds superfluous single quotes causing another error: /usr/sbin/grub2-probe: error: cannot find a GRUB drive for `${grub_probe} --target=device \${ESP}` | sed -e "s/^/\t/". Check your device.map. Fix the quoting to work at least for single device. Fixes: #5424 Fixes: 684bc0381 ("trivial: fix various shellcheck warnings") Signed-off-by: Michal Suchanek <msucha...@suse.de> --- plugins/uefi-capsule/fwupd.grub.conf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/uefi-capsule/fwupd.grub.conf.in b/plugins/uefi-capsule/fwupd.grub.conf.in index 9c3a22f23..6d17fc3cc 100755 --- a/plugins/uefi-capsule/fwupd.grub.conf.in +++ b/plugins/uefi-capsule/fwupd.grub.conf.in @@ -14,8 +14,8 @@ if [ -f @localstatedir@/lib/fwupd/uefi_capsule.conf ] && cat << EOF menuentry 'Linux Firmware Updater' \$menuentry_id_option 'fwupd' { EOF - ${grub_probe:?} - prepare_grub_to_access_device '`${grub_probe} --target=device \${ESP}` | sed -e "s/^/\t/"' + ${grub_probe:?} --version > /dev/null + prepare_grub_to_access_device "$(${grub_probe} --target=device ${ESP})" | sed -e "s/^/\t/" cat << EOF chainloader ${EFI_PATH} } -- 2.39.0
