From 7115e0e5737538b704fa4da59c9715ca9d054db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 10 May 2018 13:26:26 +0200 Subject: [PATCH] - fix conditition for rtas_errd service (#1575638) --- ppc64-diag-chkconfig.patch | 19 ------------------- ppc64-diag-service.patch | 27 +++++++++++++++++++++++++++ ppc64-diag.spec | 34 ++++++++++++++++++++-------------- 3 files changed, 47 insertions(+), 33 deletions(-) delete mode 100644 ppc64-diag-chkconfig.patch create mode 100644 ppc64-diag-service.patch diff --git a/ppc64-diag-chkconfig.patch b/ppc64-diag-chkconfig.patch deleted file mode 100644 index 76fcce9..0000000 --- a/ppc64-diag-chkconfig.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up ppc64-diag-2.4.2/scripts/rtas_errd.chkconfig ppc64-diag-2.4.2/scripts/rtas_errd ---- ppc64-diag-2.4.2/scripts/rtas_errd.chkconfig 2009-05-21 17:33:06.000000000 -0400 -+++ ppc64-diag-2.4.2/scripts/rtas_errd 2011-09-05 06:38:28.393342923 -0400 -@@ -17,11 +17,14 @@ - # 8 - 199 reserved - # - -+# chkconfig: - 95 5 -+# description: Daemon to retrieve platform errors -+ - ### BEGIN INIT INFO - # Provides: rtas_errd - # Required-Start: $local_fs $syslog $time - # Required-Stop: --# Default-Start: 2 3 5 -+# Default-Start: - # Default-Stop: 0 1 4 6 - # Short-Description: Daemon to retrieve platform errors - # Description: Starts rtas_errd daemon to retrieve platform errors diff --git a/ppc64-diag-service.patch b/ppc64-diag-service.patch new file mode 100644 index 0000000..77f7f4e --- /dev/null +++ b/ppc64-diag-service.patch @@ -0,0 +1,27 @@ +commit 608507ea8ed81209204feacbbde40e234d261141 +Author: Vasant Hegde +Date: Wed Sep 13 21:54:45 2017 +0530 + + scripts: Fix service scripts + + By mistake I added wrong condition check which resulted in unnecessary + log messages in PowerNV system. This patch fixes service script properly. + + Fixes: 1f49a51c (scripts: Improve service scripts) + Reported-by: Frédéric Bonnard + Signed-off-by: Vasant Hegde + +diff --git a/scripts/rtas_errd.service b/scripts/rtas_errd.service +index 5507b8a..8475c3e 100644 +--- a/scripts/rtas_errd.service ++++ b/scripts/rtas_errd.service +@@ -1,7 +1,7 @@ + [Unit] + Description=ppc64-diag rtas_errd (platform error handling) Service +-ConditionPathExists=|!/proc/ppc64/rtas/error_log +-ConditionPathExists=|!/proc/ppc64/error_log ++ConditionPathExists=|/proc/ppc64/rtas/error_log ++ConditionPathExists=|/proc/ppc64/error_log + After=syslog.target + + [Service] diff --git a/ppc64-diag.spec b/ppc64-diag.spec index 6873c80..2a87afc 100644 --- a/ppc64-diag.spec +++ b/ppc64-diag.spec @@ -1,6 +1,6 @@ Name: ppc64-diag Version: 2.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PowerLinux Platform Diagnostics URL: http://sourceforge.net/projects/linux-diag/files/ppc64-diag/ Group: System Environment/Base @@ -19,11 +19,13 @@ Requires: servicelog, lsvpd Requires: powerpc-utils >= 1.3.0 Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/%{version}/%{name}-%{version}.tar.gz +# fix paths and permissions Patch0: ppc64-diag-messagecatalog-location.patch -Patch1: ppc64-diag-chkconfig.patch Patch2: ppc64-diag-scriptlocation.patch Patch3: ppc64-diag-lpdscriptloc.patch Patch4: ppc64-diag-permission.patch +# https://sourceforge.net/p/linux-diag/ppc64-diag/ci/608507ea8ed81209204feacbbde40e234d261141/ +Patch5: ppc64-diag-service.patch %description This package contains various diagnostic tools for PowerLinux. @@ -39,17 +41,14 @@ administrators or connected service frameworks. %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}\/usr\/libexec\/ppc64-diag\/servevent_parse.pl %prep -%setup -q -%patch0 -p1 -b .msg_loc -%patch1 -p1 -b .chkconfig -%patch2 -p1 -b .script_loc -%patch3 -p1 -b .lpdscriptloc -%patch4 -p1 -b .permission +%autosetup -p1 + %build ./autogen.sh %configure -LDFLAGS="%{__global_ldflags}" CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" make %{?_smp_mflags} V=1 +LDFLAGS="%{build_ldflags}" CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cflags}" make %{?_smp_mflags} V=1 + %install make install DESTDIR=$RPM_BUILD_ROOT @@ -58,15 +57,19 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/ppc64-diag/* mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_unitdir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ses_pages -mkdir -p $RPM_BUILD_ROOT/%{_var}/log/dump +mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/dump +mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/opal-elog ln -sfv %{_sbindir}/usysattn $RPM_BUILD_ROOT/%{_sbindir}/usysfault %files -%license COPYING README +%license COPYING +%doc README %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/ses_pages -%dir %{_var}/log/dump +%dir %{_localstatedir}/log/%{name}/diag_disk +%dir %{_localstatedir}/log/dump +%dir %{_localstatedir}/log/opal-elog %{_mandir}/man8/* %config(noreplace) %{_sysconfdir}/%{name}/ppc64-diag.config %{_sbindir}/* @@ -121,10 +124,13 @@ fi %changelog -* Fri Mar 09 2018 Than Ngo - 2.7.4.1 +* Thu May 10 2018 Dan Horák - 2.7.4-2 +- fix conditition for rtas_errd service (#1575638) + +* Fri Mar 09 2018 Than Ngo - 2.7.4-1 - update to latest upstream 2.7.4 -* Wed Mar 07 2018 Than Ngo - - 2.7.1-6 +* Wed Mar 07 2018 Than Ngo - 2.7.1-6 - fixed bz#1552653 - ppc64-diag: Missing Fedora build flags injection * Fri Feb 09 2018 Fedora Release Engineering - 2.7.1-5