From 77c97766cf24f02f34156c92f6c64354416467de Mon Sep 17 00:00:00 2001 From: Qiumiao Zhang Date: Mon, 24 Jun 2024 11:46:01 +0000 Subject: [PATCH] fix log printing in tpcm_kunpeng moddule again Signed-off-by: Qiumiao Zhang (cherry picked from commit cf1b9b91cbfd6d85eff6461f002eddedb5f37b37) --- add-TPCM-support-with-ipmi-channel.patch | 10 +++++----- grub2.spec | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/add-TPCM-support-with-ipmi-channel.patch b/add-TPCM-support-with-ipmi-channel.patch index 4ec71a0..d536af5 100644 --- a/add-TPCM-support-with-ipmi-channel.patch +++ b/add-TPCM-support-with-ipmi-channel.patch @@ -400,9 +400,9 @@ index 0000000..f7295ee + grub_dprintf ("tpcm", "tpcm control switch turned off, ignore excute_ipmi_cmd failure.\n"); + else + { -+ err = GRUB_ERR_BUG; -+ grub_dprintf ("tpcm", "excute_ipmi_cmd failed, request sub_cmd:0x%x, ret:%lu\n", -+ request_data->SubCmd, status); ++ err = grub_error (GRUB_ERR_BUG, ++ "excute_ipmi_cmd failed, request sub_cmd:0x%x, ret:%lu\n", ++ request_data->SubCmd, status); + } + goto fail; + } @@ -459,8 +459,8 @@ index 0000000..f7295ee + &response_length, NULL); + if (status != GRUB_EFI_SUCCESS) + { -+ grub_printf ("excute_ipmi_cmd failed, request sub_cmd:%d, ret:%lu\n", -+ request_data.SubCmd, status); ++ grub_dprintf ("tpcm", "excute_ipmi_cmd failed, request sub_cmd:%d, ret:%lu\n", ++ request_data.SubCmd, status); + /* if we excute_ipmi_cmd, it could be the fllowing results: + * 1. uefi have this interface, but did not implement it. + * 2. uefi have implemented, but bmc did not support TPCM diff --git a/grub2.spec b/grub2.spec index f160f46..0ea4c36 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 47 +Release: 48 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -453,6 +453,12 @@ fi %{_datadir}/man/man* %changelog +* Mon Jun 24 2024 zhangqiumiao - 1:2.06-48 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix log printing in tpcm_kunpeng moddule again + * Tue Jun 18 2024 zhangqiumiao - 1:2.06-47 - Type:bugfix - CVE:NA -- Gitee