From a468738ec8441ead778531e159bd6f51f246a70a Mon Sep 17 00:00:00 2001 From: Qiumiao Zhang Date: Thu, 20 Jun 2024 07:06:15 +0000 Subject: [PATCH] fix log printing in tpcm_kunpeng module Signed-off-by: Qiumiao Zhang (cherry picked from commit b991af1095137f6b9bb0a3d45c90293abd1beb0c) --- add-TPCM-support-with-ipmi-channel.patch | 6 +++--- grub2.spec | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/add-TPCM-support-with-ipmi-channel.patch b/add-TPCM-support-with-ipmi-channel.patch index 29b1017..9bb9e40 100644 --- a/add-TPCM-support-with-ipmi-channel.patch +++ b/add-TPCM-support-with-ipmi-channel.patch @@ -399,9 +399,9 @@ index 0000000..57a4cea + grub_dprintf ("tpcm", "tpcm control switch turned off, ignore excute_ipmi_cmd failure.\n"); + else + { -+ err = grub_error (GRUB_ERR_BUG, -+ "excute_ipmi_cmd failed, request sub_cmd:0x%x, ret:%lu\n", -+ request_data->SubCmd, status); ++ err = GRUB_ERR_BUG; ++ grub_dprintf ("tpcm", "excute_ipmi_cmd failed, request sub_cmd:0x%x, ret:%lu\n", ++ request_data->SubCmd, status); + } + goto fail; + } diff --git a/grub2.spec b/grub2.spec index cf8fb66..a75cb87 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 17 +Release: 18 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -447,6 +447,12 @@ fi %{_datadir}/man/man* %changelog +* Wed Jun 5 2024 zhangqiumiao - 1:2.12-18 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix log printing in tpcm_kunpeng module + * Wed Jun 19 2024 yueyuankun - 1:2.12-17 - Type:requirement - CVE:NA -- Gitee