Accepting request 1110656 from home:trenn:branches:Base:System

- This contains following features: PED-6122 [GNR] RAS: mcelog Add support for Granite Rapids (ALP) PED-6102 [GNR] RAS: mcelog Add support for Granite Rapids (SLE 15 SP6) PED-6021 [SRF] RAS: mcelog support for Sierra Forest (SLE 15 SP6) PED-6050 [SRF] RAS: mcelog support for Sierra Forest (ALP) - Change git repo in _service file from git to https url - Update to version 195: * mcelog: Wire up model-specific decoding for Sierra Forest * mcelog: Add model-specific decoding for Granite Rapids * client.c: fix build w/ musl libc * mcelog: New model number for Arrowlake * mcelog: Don't overwrite model number when lookup fails * mcelog: Add Graniterapids, Grandridge and Sierraforest * mcelog: New model number for Lunarlake * mcelog: Add Emerald Rapids * Update PFA_test_howto - Adopt to mainline: M email.patch OBS-URL: https://build.opensuse.org/request/show/1110656 OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=108
2023-09-12 15:13:25 +00:00 · 2023-09-12 15:13:25 +00:00 · ae4c7ef253
commit ae4c7ef253
parent 998232d7da
8 changed files with 56 additions and 26 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 <services>
  <service name="obs_scm" mode="localonly">
    <param name="scm">git</param>
-    <param name="url">git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git</param>
+    <param name="url">https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git</param>
    <param name="changesgenerate">enable</param>
    <param name="versionrewrite-pattern">v(.*)</param>
    <param name="versionformat">@PARENT_TAG@</param>
--- a/6
+++ b/6
@ -3,4 +3,8 @@
                <param name="url">https://github.com/andikleen/mcelog</param>
              <param name="changesrevision">ee90ff20ce6a4d5e016aa249ce8b37f359f9fda4</param></service><service name="tar_scm">
                <param name="url">git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git</param>
-              <param name="changesrevision">04d51981e8805c4200f5a03b4216c8621bc52ace</param></service></servicedata>
+              <param name="changesrevision">04d51981e8805c4200f5a03b4216c8621bc52ace</param></service><service name="tar_scm">
+                <param name="url">https://github.com/andikleen/mcelog.git</param>
+              <param name="changesrevision">1f3a769c8fb736815a56ea104b7b751c5565cb88</param></service><service name="tar_scm">
+                <param name="url">https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git</param>
+              <param name="changesrevision">1f3a769c8fb736815a56ea104b7b751c5565cb88</param></service></servicedata>
--- a/email.patch
+++ b/email.patch
@ -7,10 +7,10 @@
 msg.c    |    8 ++
 6 files changed, 346 insertions(+), 3 deletions(-)

-Index: mcelog-194/Makefile
+Index: mcelog-195/Makefile
 ===================================================================
--- mcelog-194.orig/Makefile
-+++ mcelog-194/Makefile
+--- mcelog-195.orig/Makefile
+++ mcelog-195/Makefile
@@ -1,3 +1,4 @@
 +CONFIG_EMAIL := 1
 CFLAGS := -g -Os
@ -18,7 +18,7 @@ Index: mcelog-194/Makefile
 etcprefix :=
@@ -38,16 +39,24 @@ OBJ := p4.o k8.o mcelog.o dmi.o tsc.o co
        broadwell_de.o broadwell_epex.o skylake_xeon.o		 \
-        denverton.o i10nm.o sapphire.o				 \
+        denverton.o i10nm.o sapphire.o granite.o			 \
        msr.o bus.o unknown.o lookup_intel_cputype.o
 +EMAIL_OBJ := email.o
 CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o \
@ -51,10 +51,10 @@ Index: mcelog-194/Makefile
 
 version.tmp: FORCE
 	( printf "char version[] = \"" ; 			\
-Index: mcelog-194/email.c
+Index: mcelog-195/email.c
 ===================================================================
 --- /dev/null
-+++ mcelog-194/email.c
+++ mcelog-195/email.c
@@ -0,0 +1,200 @@
 +#include <unistd.h>
 +#include <signal.h>
@ -256,10 +256,10 @@ Index: mcelog-194/email.c
 +	smtp_destroy_session (session);
 +	return 0;
 +}
-Index: mcelog-194/email.h
+Index: mcelog-195/email.h
 ===================================================================
 --- /dev/null
-+++ mcelog-194/email.h
+++ mcelog-195/email.h
@@ -0,0 +1,34 @@
 +#ifndef _MCELOG_EMAIL_H_
 +#define _MCELOG_EMAIL_H_
@ -295,10 +295,10 @@ Index: mcelog-194/email.h
 +#endif
 +
 +#endif
-Index: mcelog-194/mcelog.c
+Index: mcelog-195/mcelog.c
 ===================================================================
--- mcelog-194.orig/mcelog.c
-+++ mcelog-194/mcelog.c
+--- mcelog-195.orig/mcelog.c
+++ mcelog-195/mcelog.c
@@ -37,6 +37,7 @@
 #include <assert.h>
 #include <signal.h>
@ -466,10 +466,10 @@ Index: mcelog-194/mcelog.c
 	checkdmi();
 	general_setup();
 		
-Index: mcelog-194/mcelog.h
+Index: mcelog-195/mcelog.h
 ===================================================================
--- mcelog-194.orig/mcelog.h
-+++ mcelog-194/mcelog.h
+--- mcelog-195.orig/mcelog.h
+++ mcelog-195/mcelog.h
@@ -118,6 +118,7 @@ extern int open_logfile(char *fn);
 enum option_ranges {
 	O_COMMON = 500,
@ -478,10 +478,10 @@ Index: mcelog-194/mcelog.h
 };
 
 enum syslog_opt { 
-Index: mcelog-194/msg.c
+Index: mcelog-195/msg.c
 ===================================================================
--- mcelog-194.orig/msg.c
-+++ mcelog-194/msg.c
+--- mcelog-195.orig/msg.c
+++ mcelog-195/msg.c
@@ -8,10 +8,13 @@
 #include "mcelog.h"
 #include "msg.h"
--- a/mcelog-194.obscpio
+++ b/mcelog-194.obscpio
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62b672a3ce482674d6eaf8f403924bf723f6047a0d09d7b38053819038d875ad
-size 641548
--- a/mcelog-195.obscpio
+++ b/mcelog-195.obscpio
--- a/mcelog.changes
+++ b/mcelog.changes
@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Sep 12 14:08:37 UTC 2023 - trenn@suse.de
+
+- This contains following features:
+  PED-6122
+  [GNR] RAS: mcelog Add support for Granite Rapids (ALP)
+  PED-6102
+  [GNR] RAS: mcelog Add support for Granite Rapids (SLE 15 SP6)
+  PED-6021
+  [SRF] RAS: mcelog support for Sierra Forest (SLE 15 SP6)
+  PED-6050
+  [SRF] RAS: mcelog support for Sierra Forest (ALP)
+- Change git repo in _service file from git to https url
+- Update to version 195:
+  * mcelog: Wire up model-specific decoding for Sierra Forest
+  * mcelog: Add model-specific decoding for Granite Rapids
+  * client.c: fix build w/ musl libc
+  * mcelog: New model number for Arrowlake
+  * mcelog: Don't overwrite model number when lookup fails
+  * mcelog: Add Graniterapids, Grandridge and Sierraforest
+  * mcelog: New model number for Lunarlake
+  * mcelog: Add Emerald Rapids
+  * Update PFA_test_howto
+- Adopt to mainline:
+M email.patch
+
 -------------------------------------------------------------------
 Wed Jun 14 14:58:43 UTC 2023 - trenn@suse.de

--- a/mcelog.obsinfo
+++ b/mcelog.obsinfo
@ -1,4 +1,4 @@
 name: mcelog
-version: 194
-mtime: 1686592086
-commit: 04d51981e8805c4200f5a03b4216c8621bc52ace
+version: 195
+mtime: 1694015900
+commit: 1f3a769c8fb736815a56ea104b7b751c5565cb88
--- a/mcelog.spec
+++ b/mcelog.spec
@ -21,7 +21,7 @@
  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           mcelog
-Version:        194
+Version:        195
 Release:        0
 Summary:        Log Machine Check Events
 License:        GPL-2.0-only