From 919624975b12a828700a12fa250fd90bff1b3bbe Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 31 May 2024 16:46:55 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .gitignore | 2 +- .ledmon.metadata | 1 - ...error-messages-on-non-dell-platforms.patch | 23 ------------------- SPECS/ledmon.spec | 11 +++++---- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 .ledmon.metadata delete mode 100644 SOURCES/ipmi-avoid-error-messages-on-non-dell-platforms.patch diff --git a/.gitignore b/.gitignore index 372e091..f41dfbf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ledmon-0.96.tar.gz +SOURCES/ledmon-0.97.tar.gz diff --git a/.ledmon.metadata b/.ledmon.metadata deleted file mode 100644 index d6b5510..0000000 --- a/.ledmon.metadata +++ /dev/null @@ -1 +0,0 @@ -22c2e8ce87c3325c624e2869af5ef601e36d7d26 SOURCES/ledmon-0.96.tar.gz diff --git a/SOURCES/ipmi-avoid-error-messages-on-non-dell-platforms.patch b/SOURCES/ipmi-avoid-error-messages-on-non-dell-platforms.patch deleted file mode 100644 index c4e4b83..0000000 --- a/SOURCES/ipmi-avoid-error-messages-on-non-dell-platforms.patch +++ /dev/null @@ -1,23 +0,0 @@ -From bd78c563daa6df17ad442d10127526f5450fd06b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kinga=20Ta=C5=84ska?= -Date: Thu, 17 Nov 2022 15:55:06 +0100 -Subject: [PATCH] ipmi: avoid error messages on non-dell platforms (#112) - -Signed-off-by: Kinga Tanska ---- - src/ipmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ipmi.c b/src/ipmi.c -index 3862840..d7d9e89 100644 ---- a/src/ipmi.c -+++ b/src/ipmi.c -@@ -126,7 +126,7 @@ int ipmicmd(int sa, int lun, int netfn, int cmd, int datalen, void *data, - goto end; - } - if (rcv.msg.data[0]) -- log_info("IPMI Error: %.2x\n", rcv.msg.data[0]); -+ log_debug("IPMI Error: %.2x\n", rcv.msg.data[0]); - rc = 0; - *rlen = rcv.msg.data_len - 1; - memcpy(resp, rcv.msg.data + 1, *rlen); diff --git a/SPECS/ledmon.spec b/SPECS/ledmon.spec index e22e5a8..ebf1440 100644 --- a/SPECS/ledmon.spec +++ b/SPECS/ledmon.spec @@ -1,14 +1,12 @@ Summary: Enclosure LED Utilities Name: ledmon -Version: 0.96 -Release: 3%{?dist} +Version: 0.97 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://github.com/intel/ledmon Source0: https://github.com/intel/ledmon/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: ipmi-avoid-error-messages-on-non-dell-platforms.patch - BuildRequires: perl-interpreter perl-podlators BuildRequires: sg3_utils-devel BuildRequires: pciutils-devel @@ -30,7 +28,6 @@ use this application. %prep %setup -q -%patch0 -p1 %build # can't use smp_flags because -j4 makes the build fail @@ -59,6 +56,10 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT SBIN_DIR=$RPM_BUI %{_unitdir}/ledmon.service %changelog +* Wed May 17 2023 Jan Macku - 0.97-1 +- update to 0.97 (#2159588) +- drop downstream patch - ipmi: avoid error messages on non-dell platforms + * Tue Nov 29 2022 Jan Macku - 0.96-3 - Decrease log level of IPMI messages (#2148944)