3 files changed, 13 insertions, 113 deletions

diff --git a/meta-oe/recipes-bsp/ledmon/ledmon/0001-fix-build-with-clang.patch b/meta-oe/recipes-bsp/ledmon/ledmon/0001-fix-build-with-clang.patch
deleted file mode 100644
index f1e1d6f780..0000000000
--- a/meta-oe/recipes-bsp/ledmon/ledmon/0001-fix-build-with-clang.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 28fd86fb4e18af181174176530a80672de4449d2 Mon Sep 17 00:00:00 2001
-From: alperak <alperyasinak1@gmail.com>
-Date: Sat, 18 Nov 2023 12:27:17 +0300
-Subject: [PATCH] fix build with clang
-
-struct ibpi2value is a structure which contains 2 unsigned integers.  In
-a number of cases the code was not initializing a value for the last value
-in the pair in struct ibpi2value ibpi_to_attention.  This was raised when
-using clang compiler.
-
-vmdssd.c:49:27: error: missing field 'value' initializer
-[-Werror,-Wmissing-field-initializers]
-        {LED_IBPI_PATTERN_UNKNOWN}
-
-dellssd.c:74:27: error: missing field 'value' initializer
-[-Werror,-Wmissing-field-initializers]
-        {LED_IBPI_PATTERN_UNKNOWN}
-
-amd_ipmi.c:57:27: error: missing field 'value'
-initializer [-Werror,-Wmissing-field-initializers]
-        {LED_IBPI_PATTERN_UNKNOWN}
-
-npem.c:76:27: error: missing field 'value'
-initializer [-Werror,-Wmissing-field-initializers]
-        {LED_IBPI_PATTERN_UNKNOWN}
-
-Upstream-Status: Submitted [https://github.com/intel/ledmon/pull/179]
-Signed-off-by: alperak <alperyasinak1@gmail.com>
----
- src/amd_ipmi.c | 2 +-
- src/dellssd.c  | 2 +-
- src/npem.c     | 2 +-
- src/vmdssd.c   | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/amd_ipmi.c b/src/amd_ipmi.c
-index 726f77d..ad36e9e 100644
---- a/src/amd_ipmi.c
-+++ b/src/amd_ipmi.c
-@@ -53,7 +53,7 @@ const struct ibpi2value ibpi2amd_ipmi[] = {
-        {IBPI_PATTERN_FAILED_ARRAY, 0x45},
-        {IBPI_PATTERN_REBUILD, 0x46},
-        {IBPI_PATTERN_HOTSPARE, 0x47},
--       {IBPI_PATTERN_UNKNOWN}
-+       {IBPI_PATTERN_UNKNOWN, 0}
- };
- 
- #define MG9098_CHIP_ID_REG     0x63
-diff --git a/src/dellssd.c b/src/dellssd.c
-index 3c10ec7..7f02ea1 100644
---- a/src/dellssd.c
-+++ b/src/dellssd.c
-@@ -71,7 +71,7 @@ static const struct ibpi2value ibpi2ssd[] = {
-        {IBPI_PATTERN_FAILED_DRIVE, BP_FAULT | BP_ONLINE},
-        {IBPI_PATTERN_LOCATE, BP_IDENTIFY | BP_ONLINE},
-        {IBPI_PATTERN_LOCATE_OFF, BP_ONLINE},
--       {IBPI_PATTERN_UNKNOWN}
-+       {IBPI_PATTERN_UNKNOWN, 0}
- };
- 
- #define DELL_OEM_NETFN                      0x30
-diff --git a/src/npem.c b/src/npem.c
-index c21276d..3499169 100644
---- a/src/npem.c
-+++ b/src/npem.c
-@@ -72,7 +72,7 @@ const struct ibpi2value ibpi_to_npem_capability[] = {
-        {IBPI_PATTERN_FAILED_DRIVE, PCI_NPEM_FAIL_CAP},
-        {IBPI_PATTERN_LOCATE, PCI_NPEM_LOCATE_CAP},
-        {IBPI_PATTERN_LOCATE_OFF, PCI_NPEM_OK_CAP},
--       {IBPI_PATTERN_UNKNOWN}
-+       {IBPI_PATTERN_UNKNOWN, 0}
- };
- 
- static struct pci_access *get_pci_access()
-diff --git a/src/vmdssd.c b/src/vmdssd.c
-index 51af591..9c63d90 100644
---- a/src/vmdssd.c
-+++ b/src/vmdssd.c
-@@ -45,7 +45,7 @@ struct ibpi2value ibpi_to_attention[] = {
-        {IBPI_PATTERN_REBUILD, ATTENTION_REBUILD},
-        {IBPI_PATTERN_LOCATE_OFF, ATTENTION_OFF},
-        {IBPI_PATTERN_ONESHOT_NORMAL, ATTENTION_OFF},
--       {IBPI_PATTERN_UNKNOWN}
-+       {IBPI_PATTERN_UNKNOWN, 0}
- };
- 
- #define SYSFS_PCIEHP         "/sys/module/pciehp"
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-bsp/ledmon/ledmon/0002-include-sys-select.h-and-sys-types.h.patch b/meta-oe/recipes-bsp/ledmon/ledmon/0001-include-sys-select.h-and-sys-types.h.patch
index 75bf2b4f5e..833f38a042 100644
--- a/meta-oe/recipes-bsp/ledmon/ledmon/0002-include-sys-select.h-and-sys-types.h.patch
+++ b/meta-oe/recipes-bsp/ledmon/ledmon/0001-include-sys-select.h-and-sys-types.h.patch
@@ -9,16 +9,19 @@ sys/types.h is needed for ssize_t
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Adapted to latest release - sys/types.h is already included in the project.
+
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
 ---
  src/dellssd.c | 1 +
- src/utils.h   | 1 +
- 2 files changed, 2 insertions(+)
+ 1 file changed, 1 insertion(+)
 
-diff --git a/src/dellssd.c b/src/dellssd.c
+diff --git a/src/lib/dellssd.c b/src/lib/dellssd.c
 index 7b8d431..e97fe45 100644
---- a/src/dellssd.c
-+++ b/src/dellssd.c
-@@ -27,6 +27,7 @@
+--- a/src/lib/dellssd.c
++++ b/src/lib/dellssd.c
+@@ -13,6 +13,7 @@
  #include <unistd.h>
  
  #include <sys/ioctl.h>
@@ -26,18 +29,6 @@ index 7b8d431..e97fe45 100644
  #include <linux/ipmi.h>
  
  #if _HAVE_DMALLOC_H
-diff --git a/src/utils.h b/src/utils.h
-index 720447a..c106529 100644
---- a/src/utils.h
-+++ b/src/utils.h
-@@ -21,6 +21,7 @@
- #define _UTILS_H_INCLUDED_
- 
- #include <getopt.h>
-+#include <sys/types.h>
- #include "config_file.h"
- #include "stdlib.h"
- #include "stdint.h"
 -- 
 2.21.0
 
diff --git a/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb b/meta-oe/recipes-bsp/ledmon/ledmon_1.1.0.bb
index ff3b29406b..25f638be5d 100644
--- a/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
+++ b/meta-oe/recipes-bsp/ledmon/ledmon_1.1.0.bb
@@ -8,17 +8,16 @@ HOMEPAGE = "https://github.com/intel/ledmon"
 LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
-DEPENDS = "sg3-utils udev pciutils"
+DEPENDS = "autoconf-archive-native sg3-utils udev pciutils"
 
 inherit autotools systemd pkgconfig
 
 SYSTEMD_SERVICE:${PN} = "ledmon.service"
 
-SRC_URI = "git://github.com/intel/ledmon;branch=master;protocol=https \
-           file://0002-include-sys-select.h-and-sys-types.h.patch \
-           file://0001-fix-build-with-clang.patch"
+SRC_URI = "git://github.com/intel/ledmon;branch=master;protocol=https;tag=v${PV} \
+           file://0001-include-sys-select.h-and-sys-types.h.patch"
 
-SRCREV = "b0edae14e8660b80ffe0384354038a9f62e2978d"
+SRCREV = "f70201d255b667de00f15880e99732699df6dce0"
 
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 COMPATIBLE_HOST:libc-musl = "null"