import rasdaemon-0.6.7-8.el9

SOURCES/9415b7449c70f5ea4a0209ddb89c2f5f392d3b4b.patch

@@ -0,0 +1,51 @@
+commit 9415b7449c70f5ea4a0209ddb89c2f5f392d3b4b
+Author: Muralidhara M K <muralimk@amd.com>
+Date:   Tue Jul 27 06:36:45 2021 -0500
+
+    rasdaemon: ras-mc-ctl: Fix script to parse dimm sizes
+    
+    Removes trailing spaces at the end of a line from
+    file location and fixes --layout option to parse dimm nodes
+    to get the size of each dimm from ras-mc-ctl.
+    
+    Issue is reported https://github.com/mchehab/rasdaemon/issues/43
+    Where '> ras-mc-ctl --layout' reports all 0s
+    
+    With this change the layout option prints the correct dimm sizes
+    > sudo ras-mc-ctl --layout
+              +-----------------------------------------------+
+              |                      mc0                      |
+              |  csrow0   |  csrow1   |  csrow2   |  csrow3   |
+    ----------+-----------------------------------------------+
+    ...
+    channel7: |  16384 MB  |     0 MB  |     0 MB  |     0 MB |
+    channel6: |  16384 MB  |     0 MB  |     0 MB  |     0 MB |
+    ...
+    ----------+-----------------------------------------------+
+    
+    Signed-off-by: Muralidhara M K <muralimk@amd.com>
+    Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
+    Cc: Yazen Ghannam <yazen.ghannam@amd.com>
+    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+    Link: https://lkml.kernel.org/r/20210810183855.129076-1-nchatrad@amd.com/
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 1e3aeb7..b22dd60 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -246,6 +246,7 @@ sub parse_dimm_nodes
+     if (($file =~ /max_location$/)) {
+         open IN, $file;
+         my $location = <IN>;
++        $location =~ s/\s+$//;
+         close IN;
+         my @temp = split(/ /, $location);
+ 
+@@ -288,6 +289,7 @@ sub parse_dimm_nodes
+ 
+         open IN, $file;
+         my $location = <IN>;
++        $location =~ s/\s+$//;
+         close IN;
+ 
+         my @pos;

SOURCES/d0e0bb3d73c4bc5060da20270a089857bba2a64c.patch

@@ -0,0 +1,42 @@
+commit d0e0bb3d73c4bc5060da20270a089857bba2a64c
+Author: Justin Vreeland <vreeland.justin@gmail.com>
+Date:   Tue Nov 2 19:51:50 2021 -0700
+
+    Update ras-mc-ctl manpage to match current options
+    
+    Signed-off-by: Justin Vreeland <vreeland.justin@gmail.com>
+    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+
+diff --git a/man/ras-mc-ctl.8.in b/man/ras-mc-ctl.8.in
+index 26230e0..a605122 100644
+--- a/man/ras-mc-ctl.8.in
++++ b/man/ras-mc-ctl.8.in
+@@ -79,9 +79,27 @@ Specify an alternate location for the labels database.
+ Specify a delay of \fBtime\fR seconds before registering DIMM labels.
+ Only meaninful if used together with --register-labels.
+ .TP
+-.BI "--layout
++.BI "--layout"
+ Prints the memory layout as detected by the EDAC driver. Useful to check
+ if the EDAC driver is properly detecting the memory controller architecture.
++.TP
++.BI "--summary"
++Presents a summary of the logged errors.
++.TP
++.BI "--errors"
++Shows the errors stored at the error database.
++.TP
++.BI "--error-count"
++Shows the corrected and uncorrected error counts using sysfs.
++.TP
++.BI "--vendor-errors-summary="platform-id
++Pressents a summary of the vendor-specific logged errors.
++.TP
++.BI "--vendor-errors="platform-id
++Shows the vendor-specific errors stored in the error database.
++.TP
++.BI "--vendor-platforms"
++Shows the supported platforms with platform-ids for the vendor-specific errors.
+ 
+ .SH MAINBOARD CONFIGURATION
+ .PP

SPECS/rasdaemon.spec

@@ -1,6 +1,6 @@
 Name:			rasdaemon
 Version:		0.6.7
-Release:		5%{?dist}
+Release:		8%{?dist}
 Summary:		Utility to receive RAS error tracings
 License:		GPLv2
 URL:			http://git.infradead.org/users/mchehab/rasdaemon.git
@@ -24,6 +24,8 @@ Patch15: fc1dd37d422fc907416afd028514fff59b63ae12.patch
 Patch16: 6bc43db1b6b3d73805179c21d1dd5521e8dc0f74.patch
 Patch17: 2b6a54b0d31e02e657171fd27f4e31d996756bc6.patch
 Patch18: 7ccf12f5ae26a055926d175d908c7930293438c4.patch
+Patch19: 9415b7449c70f5ea4a0209ddb89c2f5f392d3b4b.patch
+Patch20: d0e0bb3d73c4bc5060da20270a089857bba2a64c.patch
 
 ExcludeArch:		s390 s390x
 BuildRequires:		make
@@ -77,6 +79,8 @@ an utility for reporting current error counts from the EDAC sysfs files.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 # The tarball is locked in time the first time aclocal was ran and will keep
 # requiring an older version of automake
@@ -112,6 +116,15 @@ sed -i "s/^PAGE_CE_ACTION=.*/PAGE_CE_ACTION=account/" %{buildroot}/%{_sysconfdir
 %{_sysconfdir}/sysconfig/rasdaemon
 
 %changelog
+* Tue May 03 2022 Aristeu Rozanski <aris@redhat.com> 0.6.7-8
+- Update ras-mc-ctl manpage to match current options [2079132]
+
+* Mon May 02 2022 Aristeu Rozanski <aris@redhat.com> 0.6.7-7
+- Fix issue printing memory module sizes [2080596]
+
+* Thu Mar 31 2022 Aristeu Rozanski <aris@redhat.com> 0.6.7-6
+- Merging 2065729 fixes into 9.1 branch [2067499]
+
 * Thu Mar 24 2022 Aristeu Rozanski <aris@redhat.com> 0.6.7-5
 - Trying to guess what's going on on the testing side [2065729]