Accepting request 250300 from home:elvigia:branches:Base:System

- mcelog.tmpfiles, mcelog-socket-path.patch, move socket
  and pid file to /run/mcelog directory.
  This update may require reboot as the relevant rpm macro
  tmpfiles_create is not yet in any product.

OBS-URL: https://build.opensuse.org/request/show/250300
OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=45
This commit is contained in:
Thomas Renninger 2014-09-22 08:53:25 +00:00 committed by Git OBS Bridge
parent b1ad5b9238
commit 5709ea8d39
4 changed files with 30 additions and 3 deletions

13
mcelog-socket-path.patch Normal file
View File

@ -0,0 +1,13 @@
--- mcelog-1.0.1.orig/paths.h
+++ mcelog-1.0.1/paths.h
@@ -4,8 +4,8 @@
#define DIMM_DB_FILENAME PREFIX "/var/lib/memory-errors"
#define CONFIG_FILENAME PREFIX "/etc/mcelog/mcelog.conf"
-#define SOCKET_PATH "/var/run/mcelog-client"
+#define SOCKET_PATH "/run/mcelog/mcelog-client"
#define LOG_FILE "/var/log/mcelog"
-#define PID_FILE "/var/run/mcelog.pid"
+#define PID_FILE "/run/mcelog/mcelog.pid"

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Sep 20 03:16:05 UTC 2014 - crrodriguez@opensuse.org
- mcelog.tmpfiles, mcelog-socket-path.patch, move socket
and pid file to /run/mcelog directory.
This update may require reboot as the relevant rpm macro
tmpfiles_create is not yet in any product.
-------------------------------------------------------------------
Wed Sep 3 15:41:05 UTC 2014 - trenn@suse.de

View File

@ -16,7 +16,6 @@
#
Name: mcelog
Summary: Log Machine Check Events
License: GPL-2.0
@ -32,6 +31,7 @@ Source: mcelog-%{version}.tar.bz2
Source2: mcelog.sysconfig
Source3: mcelog.systemd
Source4: 90-mcelog.rules
Source5: mcelog.tmpfiles
Source6: README.email_setup
Patch1: email.patch
Patch2: mcelog_invert_prefill_db_warning.patch
@ -44,6 +44,7 @@ Patch8: patches/add-f14h-support.patch
Patch9: patches/add-f15h-support.patch
Patch10: patches/add-f16h-support.patch
Patch11: 0001-Continue-without-dmi-when-no-SMBIOS-or-SMBIOS-0x0-in.patch
Patch12: mcelog-socket-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq
Url: https://git.kernel.org/cgit/utils/cpu/mce/mcelog.git
@ -80,7 +81,7 @@ Authors:
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%build
export SUSE_ASNEEDED=0
make CFLAGS="$RPM_OPT_FLAGS"
@ -99,7 +100,8 @@ mkdir -p $RPM_BUILD_ROOT/%_docdir/%name
install -m 644 %SOURCE6 $RPM_BUILD_ROOT/%_docdir/%name/README.email_setup
install -m 644 lk10-mcelog.pdf $RPM_BUILD_ROOT/%_docdir/%name/lk10-mcelog.pdf
install -D -m 0644 %SOURCE3 %{buildroot}%{_unitdir}/mcelog.service
install -D -m 0644 %SOURCE4 %{buildroot}%{_udevrulesdir}/90-mcelog.rules
install -D -m 0644 %SOURCE4 %{buildroot}%{_udevrulesdir}/90-mcelog.rules
install -D -m 0644 %SOURCE5 %{buildroot}%{_tmpfilesdir}/mcelog.conf
ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcmcelog
%clean
@ -110,7 +112,9 @@ rm -rf $RPM_BUILD_ROOT
%post
%fillup_only
%{?tmpfiles_create:%{tmpfiles_create}}
%udev_rules_update
%service_add_post %{name}.service
%preun
@ -130,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
/etc/mcelog/*trigger
%{_unitdir}/mcelog.service
%{_udevrulesdir}/90-mcelog.rules
%{_tmpfilesdir}/mcelog.conf
%_docdir/%name
%_sbindir/rcmcelog

1
mcelog.tmpfiles Normal file
View File

@ -0,0 +1 @@
d /run/mcelog 0755 root root -