From 0c27de37d72779b16fa5bf2e6a6db2b6fe5c7d028eee54b2f30e95861c07ea34 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 30 Apr 2019 20:22:51 +0000 Subject: [PATCH] Accepting request 694886 from home:gqjiang:branches:Base:System Update to version 0.92 OBS-URL: https://build.opensuse.org/request/show/694886 OBS-URL: https://build.opensuse.org/package/show/Base:System/ledmon?expand=0&rev=30 --- ...olume-under-reshape-as-DEVICE_TYPE_V.patch | 38 ------------------- ledmon.changes | 6 +++ ledmon.spec | 6 +-- v0.90.tar.gz | 3 -- v0.92.tar.gz | 3 ++ 5 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 0001-Recognize-RAID-volume-under-reshape-as-DEVICE_TYPE_V.patch delete mode 100644 v0.90.tar.gz create mode 100644 v0.92.tar.gz diff --git a/0001-Recognize-RAID-volume-under-reshape-as-DEVICE_TYPE_V.patch b/0001-Recognize-RAID-volume-under-reshape-as-DEVICE_TYPE_V.patch deleted file mode 100644 index 9dd963f..0000000 --- a/0001-Recognize-RAID-volume-under-reshape-as-DEVICE_TYPE_V.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c57e7d6d2dabe9e9d17d2e3aa4a2e77f7dc70acd Mon Sep 17 00:00:00 2001 -From: Michal Zylowski -Date: Tue, 27 Mar 2018 20:27:19 +0200 -Subject: [PATCH] Recognize RAID volume under reshape as DEVICE_TYPE_VOLUME - -Ledmon detects RAID device type by parsing value of sysfs file -"metadata_version" (/sys/block/mdXXX/md/metadata_version). When IMSM -RAID volume is under reshape, metadata_version file has value -"external:-md127/0". In current ledmon version this md device will be -wrongly recognized as container. - -Recognize volumes under reshape as DEVICE_TYPE_VOLUME not -DEVICE_TYPE_CONTAINER. - -This patch also fixes problem with blinking during reshape on some -environments. - -Signed-off-by: Michal Zylowski ---- - src/sysfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sysfs.c b/src/sysfs.c -index 1a18a8b36bf8..f42be09a9cd9 100644 ---- a/src/sysfs.c -+++ b/src/sysfs.c -@@ -125,7 +125,7 @@ static enum device_type _get_device_type(const char *path) - if (p != NULL) { - if (strlen(p) > 0) { - if (strncmp(p, "external:", 9) == 0) { -- if (p[9] == '/') -+ if (p[9] == '/' || p[9] == '-') - result = DEVICE_TYPE_VOLUME; - else - result = DEVICE_TYPE_CONTAINER; --- -2.12.3 - diff --git a/ledmon.changes b/ledmon.changes index 874f2b9..84bf89a 100644 --- a/ledmon.changes +++ b/ledmon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 17 03:36:17 UTC 2019 - gqjiang@suse.com + +- Update to version 0.92 per https://jira.suse.de/browse/SLE-6784 +- Drop 0001-Recognize-RAID-volume-under-reshape-as-DEVICE_TYPE_V.patch + ------------------------------------------------------------------- Tue Oct 23 02:18:22 UTC 2018 - gqjiang@suse.com diff --git a/ledmon.spec b/ledmon.spec index 0ecc8c0..c2facef 100644 --- a/ledmon.spec +++ b/ledmon.spec @@ -1,7 +1,7 @@ # # spec file for package ledmon # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,13 @@ Name: ledmon -Version: 0.90 +Version: 0.92 Release: 0 Summary: Enclosure LED Utilities License: GPL-2.0 Group: Hardware/Other Url: https://github.com/intel/ledmon/ Source0: https://github.com/intel/ledmon/archive/v%{version}.tar.gz -Patch1: 0001-Recognize-RAID-volume-under-reshape-as-DEVICE_TYPE_V.patch BuildRequires: libsgutils-devel BuildRequires: libudev-devel Provides: sgpio:/sbin/ledmon @@ -38,7 +37,6 @@ solutions. %prep %setup -q -%patch1 -p1 %build make -j1 CXFLAGS="%{optflags} -lsgutils2 -std=c99" diff --git a/v0.90.tar.gz b/v0.90.tar.gz deleted file mode 100644 index 3989c18..0000000 --- a/v0.90.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33f87b54ec343db6336357c30b47d25976aa12a0de62da9be6ec17208ff846d1 -size 65722 diff --git a/v0.92.tar.gz b/v0.92.tar.gz new file mode 100644 index 0000000..b28b37c --- /dev/null +++ b/v0.92.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db27183a5a900e7d8bd443143b9c4f2e991d5cbb8c7fbd9531f704699c1cfa07 +size 68779