From f3fadcfa027266e617731390f245df28fe254603 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Thu, 18 Dec 2014 12:08:18 -0500 Subject: [PATCH] mcelog, update to 101 latest It has been a long time since this package was updated. Let's jump to latest upstream, 101. Resolves: bz1175832 --- .gitignore | 1 + ....0pre3-fix-trigger-path-and-cacheing.patch | 34 ------------- mcelog-fix-trigger-path-and-cacheing.patch | 11 +++++ mcelog.spec | 48 ++++++++++++------- sources | 2 +- 5 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 mcelog-1.0pre3-fix-trigger-path-and-cacheing.patch create mode 100644 mcelog-fix-trigger-path-and-cacheing.patch diff --git a/.gitignore b/.gitignore index 998870c..cfd69c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mcelog-1.0pre3.tar.bz2 /mcelog-6e4e2a00.tar.bz2 /mcelog-f0d7654.tar.bz2 +/mcelog-9bfaad8f92c5.tar.bz2 diff --git a/mcelog-1.0pre3-fix-trigger-path-and-cacheing.patch b/mcelog-1.0pre3-fix-trigger-path-and-cacheing.patch deleted file mode 100644 index 5206b67..0000000 --- a/mcelog-1.0pre3-fix-trigger-path-and-cacheing.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urNp mcelog-1.0pre3_orig/Makefile mcelog-1.0pre3/Makefile ---- mcelog-1.0pre3_orig/Makefile 2010-01-20 21:36:52.000000000 -0500 -+++ mcelog-1.0pre3/Makefile 2010-11-10 04:51:05.512725239 -0500 -@@ -57,7 +57,7 @@ install: mcelog - install -m 644 -p mcelog.8 ${prefix}/share/man/man8 - install -m 644 -p -b mcelog.conf ${etcprefix}/etc/mcelog/mcelog.conf - for i in ${TRIGGERS} ; do \ -- install -m 755 -p -b triggers/$$i ${etcprefix}/etc/mcelog ; \ -+ install -m 755 -p -b triggers/$$i ${etcprefix}/etc/mcelog/triggers ; \ - done - ifdef DOCDIR - install -m 644 -p ${DOC} ${DOCDIR} -diff -urNp mcelog-1.0pre3_orig/mcelog.cron mcelog-1.0pre3/mcelog.cron ---- mcelog-1.0pre3_orig/mcelog.cron 2010-01-20 21:36:52.000000000 -0500 -+++ mcelog-1.0pre3/mcelog.cron 2010-11-10 04:51:05.593724528 -0500 -@@ -1,2 +1,5 @@ - #!/bin/bash --/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog -+ -+# Disabled by default on Fedora since this is run as daemon -+# using the mcelog.service systemd configuration entries. -+#/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog -diff -urNp mcelog-1.0pre3_orig/triggers/cache-error-trigger mcelog-1.0pre3/triggers/cache-error-trigger ---- mcelog-1.0pre3_orig/triggers/cache-error-trigger 2010-01-20 21:36:52.000000000 -0500 -+++ mcelog-1.0pre3/triggers/cache-error-trigger 2010-11-10 04:51:05.594724981 -0500 -@@ -17,7 +17,7 @@ - # - # offline the CPUs (except CPU #0) sharing the affected cache - # --for i in $CPUS_AFFECTED ; do -+for i in $AFFECTED_CPUS ; do - if [ $i = 0 ] ; then - logger -s -p daemon.warn -t mcelog "Not offlining CPU 0" - continue diff --git a/mcelog-fix-trigger-path-and-cacheing.patch b/mcelog-fix-trigger-path-and-cacheing.patch new file mode 100644 index 0000000..631a971 --- /dev/null +++ b/mcelog-fix-trigger-path-and-cacheing.patch @@ -0,0 +1,11 @@ +diff --git a/mcelog.cron b/mcelog.cron +index 4335caa..317b699 100755 +--- a/mcelog.cron ++++ b/mcelog.cron +@@ -1,2 +1,5 @@ + #!/bin/bash +-/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog ++ ++# Disabled by default on Fedora since this is run as daemon ++# using the mcelog.service systemd configuration entries. ++#/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog diff --git a/mcelog.spec b/mcelog.spec index ea2edf6..b08b8f5 100644 --- a/mcelog.spec +++ b/mcelog.spec @@ -1,24 +1,25 @@ -%define last_git_commit f0d7654 +%define last_git_commit 9bfaad8f92c5 Summary: Tool to translate x86-64 CPU Machine Check Exception data Name: mcelog -Version: 1.0 -Release: 0.13.%{last_git_commit}%{?dist} -Epoch: 2 +Version: 101 +Release: 1.%{last_git_commit}%{?dist} +Epoch: 3 Group: System Environment/Base License: GPLv2 Source0: mcelog-%{last_git_commit}.tar.bz2 +# note that this source OVERRIDES the one on the tarball above! Source1: mcelog.conf Source2: mcelog.service Source10: mcelog.setup -Patch0: mcelog-disable-cron-job.patch +Patch0: mcelog-fix-trigger-path-and-cacheing.patch URL: https://github.com/andikleen/mcelog.git - +Buildroot: %{_tmppath}/%{name}-%{version}-root ExclusiveArch: i686 x86_64 -BuildRequires: systemd-devel -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +BuildRequires: systemd %description mcelog is a utility that collects and decodes Machine Check Exception data @@ -26,7 +27,7 @@ on x86-32 and x86-64 systems. It can be run either as a daemon, or by cron. %prep %setup -q -n %{name}-%{last_git_commit} -%patch0 -p1 -b .disable-cron-job +%patch0 -p1 -b .fix-triggers-and-cacheing %build mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} @@ -36,6 +37,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir} make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" %install +rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,8} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers @@ -53,17 +55,28 @@ install -p -m755 mcelog.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly/mcelog.c install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mcelog.service install -p -m644 mcelog.8 $RPM_BUILD_ROOT/%{_mandir}/man8 +%clean +rm -rf $RPM_BUILD_ROOT + %post -%systemd_post mcelog.service +systemctl enable mcelog.service &> /dev/null || +systemctl daemon-reload &> /dev/null %preun -%systemd_preun mcelog.service +# Handle removing mcelog +if [ "$1" -eq 0 ]; then + systemctl disable mcelog.service &> /dev/null + systemctl stop mcelog.service &> /dev/null +fi %postun # Handle upgrading mcelog -%systemd_postun_with_restart mcelog.service +if [ "$1" -ge 1 ]; then + systemctl try-restart mcelog.service &> /dev/null +fi %files +%defattr(-,root,root,-) %doc README CHANGES %{_sbindir}/mcelog %dir %{_sysconfdir}/mcelog @@ -75,10 +88,13 @@ install -p -m644 mcelog.8 $RPM_BUILD_ROOT/%{_mandir}/man8 %attr(0644,root,root) %{_mandir}/*/* %changelog -* Sun Aug 17 2014 Fedora Release Engineering - 2:1.0-0.13.f0d7654 +* Thu Dec 18 2014 Prarit Bhargava 3:101-1.9bfaad8f92c5 +- Update to 101 (#1175832) + +* Sun Aug 17 2014 Fedora Release Engineering 2:1.0-0.13.f0d7654 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Sat Jun 07 2014 Fedora Release Engineering - 2:1.0-0.12.f0d7654 +* Sat Jun 07 2014 Fedora Release Engineering 2:1.0-0.12.f0d7654 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Wed Aug 14 2013 Prarit Bhargava 2:1.0-0.11.f0d7654 diff --git a/sources b/sources index 6a333b9..be78c22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9d57ec90fb53b873b7580f78c88dd20 mcelog-f0d7654.tar.bz2 +c0108c8a0db281f9cb4355c40b8ff126 mcelog-9bfaad8f92c5.tar.bz2