Compare commits

...

2 Commits

Author SHA1 Message Date
Jan Macku a7a8dc937d update to 1.0.0 2024-04-13 02:33:37 +00:00
Jan Macku 8f46e885c4 update to 0.97
Resolves: #2159926
2023-05-17 14:15:13 +02:00
6 changed files with 54 additions and 64 deletions

2
.gitignore vendored
View File

@ -13,3 +13,5 @@
/ledmon-0.92.tar.gz
/ledmon-0.95.tar.gz
/ledmon-0.96.tar.gz
/ledmon-0.97.tar.gz
/ledmon-1.0.0.tar.gz

1
.ledmon.metadata Normal file
View File

@ -0,0 +1 @@
07c962e4517acc1b7a7bbd7440a702ac4b50bec1 ledmon-1.0.0.tar.gz

View File

@ -1,23 +0,0 @@
From bd78c563daa6df17ad442d10127526f5450fd06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kinga=20Ta=C5=84ska?= <kinga.tanska@intel.com>
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 <kinga.tanska@intel.com>
---
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);

View File

@ -1,18 +1,20 @@
Summary: Enclosure LED Utilities
Name: ledmon
Version: 0.96
Release: 5%{?dist}
Version: 1.0.0
Release: 1%{?dist}
License: GPLv2+
URL: https://github.com/intel/ledmon
Source0: https://github.com/intel/ledmon/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: ledmon_format-truncation-flag.patch
Patch1: ipmi-avoid-error-messages-on-non-dell-platforms.patch
BuildRequires: sg3_utils-devel
BuildRequires: pciutils-devel
BuildRequires: autoconf automake
BuildRequires: autoconf-archive
BuildRequires: gcc make
BuildRequires: libconfig-devel
BuildRequires: libtool
BuildRequires: pciutils-devel
BuildRequires: sg3_utils-devel
# Needed for pkgconfig usage.
BuildRequires: pkgconfig(systemd)
# Needed for the udev dependency.
BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros
@ -28,21 +30,39 @@ types of system: 2-LED system (Activity LED, Status LED) and 3-LED system
(Activity LED, Locate LED, Fail LED). User must have root privileges to
use this application.
%package libs
Summary: Runtime library files for %{name}
Requires: pciutils-libs
Requires: sg3_utils-libs
%description libs
The %{name}-libs package contains runtime libraries for applications
that use %{name}.
%package devel
Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: pciutils-devel
Requires: sg3_utils-devel
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q
# remove -Werror=format-truncation=1 in order to build package
%patch0 -p1
%patch1 -p1
autoreconf -fiv
%build
sh autogen.sh
%configure --enable-systemd=yes
make
%configure --enable-systemd=yes --enable-library --disable-static
%make_build
%install
%make_install SBIN_DIR=$RPM_BUILD_ROOT/%{_sbindir} MANDIR=$RPM_BUILD_ROOT%{_mandir}
# These files are not useful for install
find %{buildroot} -name '*.la' -delete
%post
%systemd_post ledmon.service
@ -59,7 +79,23 @@ make
%{_mandir}/*/*
%{_unitdir}/ledmon.service
%files libs
%{_libdir}/*.so.*
%files devel
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Fri Apr 12 2024 Jan Macku <jamacku@redhat.com> - 1.0.0-1
- update to 1.0.0
- package shared ledmon library by Tony Asleson
* Wed May 17 2023 Jan Macku <jamacku@redhat.com> - 0.97-1
- update to 0.97 (#2159926)
- drop ipmi-avoid-error-messages-on-non-dell-platforms.patch
* Mon Nov 28 2022 Jan Macku <jamacku@redhat.com> - 0.96-5
- Decrease log level of IPMI messages (#2148954)

View File

@ -1,26 +0,0 @@
From a82b0e4080254e68eb70a338f8f6f7e6a6dbc581 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 2 Feb 2021 11:08:20 +0100
Subject: [PATCH] ledmon_format-truncation-flag
suggested by kdudka
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 8fd5e6b..b80e2b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AM_CPPFLAGS='-D_DEBUG -D_GNU_SOURCE -D_DEFAULT_SOURCE -DDMALLOC_DISABLE -DBUILD_
AC_DEFUN([AX_AM_CFLAGS_ADD],[AX_CHECK_COMPILE_FLAG($1, AM_CFLAGS="$AM_CFLAGS $1")])
AX_AM_CFLAGS_ADD([-Wformat -Werror=format-security])
AX_AM_CFLAGS_ADD([-Werror=format-overflow=2])
-AX_AM_CFLAGS_ADD([-Werror=format-truncation=1])
+dnl AX_AM_CFLAGS_ADD([-Werror=format-truncation=1])
AX_AM_CFLAGS_ADD([-Werror=shift-negative-value])
AX_AM_CFLAGS_ADD([-Werror=alloca])
AX_AM_CFLAGS_ADD([-Werror=missing-field-initializers])
--
2.29.2

View File

@ -1 +1 @@
SHA512 (ledmon-0.96.tar.gz) = 2f5229c69478fb2c37466d2a3a76304f71b5ff1f95f42f373b96bb43968a45225ba71570fe96c9e251224a0107a55106a2bed767d7741f75ba8335539422e3cb
SHA512 (ledmon-1.0.0.tar.gz) = af4dcfaf0284cfc5d88f09d2b4974514f40901c26c640a12ba4ae9bbe16e29e0ca975bc413cf155996162b324b5d365e7bc0306db0329aa755df690ac541a3a6