Accepting request 1087786 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1087786
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ledmon?expand=0&rev=26

0002-add-Dell-15G-servers.patch

@@ -1,56 +0,0 @@
-From 7274b21797d1ad76a2f4ccd2e3f70279e50512b4 Mon Sep 17 00:00:00 2001
-From: prabhakar <prabhakar.pujeri@dell.com>
-Date: Tue, 5 Jul 2022 08:16:18 -0400
-Subject: [PATCH 2/2] add Dell 15G servers
-
----
- src/dellssd.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/dellssd.c b/src/dellssd.c
-index 5a7ac5f4a629..fce3110d62d5 100644
---- a/src/dellssd.c
-+++ b/src/dellssd.c
-@@ -93,6 +93,9 @@ enum {
-   DELL_13G_MODULAR    = 0x21,
-   DELL_14G_MONOLITHIC = 0x30,
-   DELL_14G_MODULAR    = 0x31,
-+  DELL_15G_MONOLITHIC = 0x40,
-+  DELL_15G_MODULAR    = 0x41,
-+
- };
- 
- int get_dell_server_type()
-@@ -125,6 +128,9 @@ int get_dell_server_type()
- 	case DELL_13G_MODULAR:
- 	case DELL_14G_MONOLITHIC:
- 	case DELL_14G_MODULAR:
-+	case DELL_15G_MONOLITHIC:
-+	case DELL_15G_MODULAR:
-+
- 		gen = rdata[10];
- 		return gen;
- 	default:
-@@ -166,6 +172,9 @@ static int ipmi_setled(int b, int d, int f, int state)
- 		break;
- 	case DELL_14G_MONOLITHIC:
- 	case DELL_14G_MODULAR:
-+	case DELL_15G_MONOLITHIC:
-+	case DELL_15G_MODULAR:
-+
- 		data[1] = DELL_OEM_STORAGE_GETDRVMAP_14G;
- 		break;
- 	}
-@@ -206,6 +215,9 @@ static int ipmi_setled(int b, int d, int f, int state)
- 		break;
- 	case DELL_14G_MONOLITHIC:
- 	case DELL_14G_MODULAR:
-+	case DELL_15G_MONOLITHIC:
-+	case DELL_15G_MODULAR:
-+
- 		data[1] = DELL_OEM_STORAGE_SETDRVSTATUS_14G;
- 		break;
- 	}
--- 
-2.34.1
-

0003-ipmi-avoid-error-messages-on-non-dell-platforms-112.patch

@@ -1,26 +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);
--- 
-2.39.2
-

ledmon-0.96.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97534302a60f03b90e69228a6a56096cf3fdfc8eb31fea52a974445268fdf5d9
-size 83222

ledmon.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Thu May 18 03:50:57 UTC 2023 - Nicholas Yang <nicholas.yang@suse.com>
+
+- Update to version 0.97:
+
+  Enhancements
+
+    ledctl: add support to empty slots blinking
+    ledmon license change to LGPLv2
+    ledctl: Add SES get/set/list slot support
+    Update NPEM wait command
+    Remove exclusionary language
+    ledmon: Define ONESHOT_NORMAL for VMD
+
+  Bug fixes
+
+    ipmi: avoid error messages on non-dell platforms
+    vmdssd: define normal pattern
+    ledctl: clear unsupported params from config
+    block.c: get_block_device_from_sysfs_path modification
+    fix ibpi_value lists getter
+    amd_ipmi: Allow to _enable_smbus_control
+    ledmon.c: allocate memory for ignore
+    sysfs: add only vmd devices to slots_list
+    Rename --controller parameter
+    Slots list implementations and fixes
+
+- Drop no longer needed patches:
+  * 0001-Ledctl-slots-management-94.patch
+  * 0002-add-Dell-15G-servers.patch
+  * 0003-ipmi-avoid-error-messages-on-non-dell-platforms-112.patch
+
 -------------------------------------------------------------------
 Wed Apr 26 11:27:18 UTC 2023 - Johannes Segitz <jsegitz@suse.com>
 

ledmon.spec

@@ -17,17 +17,14 @@
 
 
 Name:           ledmon
-Version:        0.96
+Version:        0.97
 Release:        0
 Summary:        Enclosure LED Utilities
-License:        GPL-2.0-only
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Hardware/Other
 URL:            https://github.com/intel/ledmon/
-Source0:        https://github.com/intel/ledmon/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://github.com/intel/ledmon/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:         harden_ledmon.service.patch
-Patch1:         0001-Ledctl-slots-management-94.patch
-Patch2:         0002-add-Dell-15G-servers.patch
-Patch3:         0003-ipmi-avoid-error-messages-on-non-dell-platforms-112.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libsgutils-devel
@@ -74,7 +71,7 @@ rm %{buildroot}%{_datarootdir}/doc/ledmon/README.md
 %service_del_postun %{name}.service
 
 %files
-%license COPYING
+%license COPYING COPYING.LIB
 %doc README.md
 %{_sbindir}/ledmon
 %{_sbindir}/ledctl