From f6b6881fbc791a1f226c5cacc11fb42d2ea47a8f Mon Sep 17 00:00:00 2001
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Fri, 21 Mar 2014 16:29:48 +0530
Subject: [PATCH] Update to latest upstream 2.6.4

Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
---
 .gitignore        |  1 +
 opal_errd.service | 14 ++++++++++++++
 ppc64-diag.spec   | 27 +++++++++++++++++++--------
 sources           |  2 +-
 4 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 opal_errd.service

diff --git a/.gitignore b/.gitignore
index 3dbebae..064e57d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /ppc64-diag-2.6.1.tar.gz
 /ppc64-diag-2.6.2.tar.gz
 /ppc64-diag-2.6.3.tar.gz
+/ppc64-diag-2.6.4.tar.gz
diff --git a/opal_errd.service b/opal_errd.service
new file mode 100644
index 0000000..4aee27c
--- /dev/null
+++ b/opal_errd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=opal_errd (PowerNV platform error handling) Service
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/libexec/ppc64-diag/opal_errd start
+ExecStop=/usr/libexec/ppc64-diag/opal_errd stop
+StandardOutput=syslog
+StandardError=syslog
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index 821c18b..459dc38 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -1,5 +1,5 @@
 Name:           ppc64-diag
-Version:        2.6.3
+Version:        2.6.4
 Release:        1%{?dist}
 Summary:        PowerLinux Platform Diagnostics
 URL:            http://sourceforge.net/projects/linux-diag/files/ppc64-diag/
@@ -18,6 +18,7 @@ Requires:	powerpc-utils >= 1.2.19
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/%{version}/%{name}-%{version}.tar.gz
 Source1:        rtas_errd.service
+Source2:        opal_errd.service
 Patch0:         ppc64-diag-2.4.2-messagecatalog-location.patch
 Patch1:         ppc64-diag-2.4.2-chkconfig.patch
 Patch2:         ppc64-diag-2.4.3-scriptlocation.patch
@@ -56,9 +57,12 @@ chmod 644 COPYRIGHT
 rm -f $RPM_BUILD_ROOT/usr/share/doc/packages/ppc64-diag/COPYRIGHT
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/%{name}
 mv -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/rtas_errd $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/opal_errd $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}
 mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ses_pages
+mkdir -p $RPM_BUILD_ROOT/%{_var}/log/dump
 ln -sfv %{_sbindir}/usysattn $RPM_BUILD_ROOT/%{_sbindir}/usysfault
 
 %clean
@@ -69,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYRIGHT
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/ses_pages
+%dir %{_var}/log/dump
 %{_mandir}/man8/*
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/%{name}/ppc64-diag.config
 %attr(755,root,root) %{_sbindir}/*
@@ -91,23 +96,26 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) %{_datadir}/%{name}/message_catalog/with_regex/*
 %attr(755,root,root) %{_sysconfdir}/rc.powerfail
 %attr(755,root,root) %{_libexecdir}/%{name}/rtas_errd
+%attr(755,root,root) %{_libexecdir}/%{name}/opal_errd
 %attr(644,root,root) %{_unitdir}/rtas_errd.service
+%attr(644,root,root) %{_unitdir}/opal_errd.service
 
 %post
 # Post-install script --------------------------------------------------
-%{_libexecdir}/%{name}/lp_diag_setup --register >/dev/null
-%{_libexecdir}/%{name}/ppc64_diag_setup --register >/dev/null
+%{_libexecdir}/%{name}/lp_diag_setup --register >/dev/null 2>&1
+%{_libexecdir}/%{name}/ppc64_diag_setup --register >/dev/null 2>&1
 if [ "$1" = "1" ]; then # first install
-    systemctl -q enable rtas_errd.service
-    systemctl start rtas_errd.service
+    systemctl -q enable opal_errd.service >/dev/null || systemctl -q enable rtas_errd.service >/dev/null
+    systemctl start opal_errd.service >/dev/null || systemctl start rtas_errd.service >/dev/null
 elif [ "$1" = "2" ]; then # upgrade
-    systemctl restart rtas_errd.service
+    systemctl restart opal_errd.service >/dev/null || systemctl restart rtas_errd.service >/dev/null
 fi
 
 %preun
 # Pre-uninstall script -------------------------------------------------
 if [ "$1" = "0" ]; then # last uninstall
-    systemctl stop rtas_errd.service
+    systemctl stop opal_errd.service >/dev/null || systemctl stop rtas_errd.service >/dev/null
+    systemctl -q disable opal_errd.service
     systemctl -q disable rtas_errd.service
     %{_libexecdir}/%{name}/ppc64_diag_setup --unregister >/dev/null
     %{_libexecdir}/%{name}/lp_diag_setup --unregister >/dev/null
@@ -116,11 +124,14 @@ fi
 %triggerin -- librtas
 # trigger on librtas upgrades ------------------------------------------
 if [ "$2" = "2" ]; then
-    systemctl restart rtas_errd.service
+    systemctl restart opal_errd.service >/dev/null || systemctl restart rtas_errd.service >/dev/null
 fi
 
 
 %changelog
+* Fri Mar 21 2014 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 2.6.4
+- Update to latest upstream 2.6.4
+
 * Fri Mar 07 2014 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 2.6.3
 - Update to latest upstream 2.6.3
 
diff --git a/sources b/sources
index c9c0ea2..725bedc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2275bd010bf0bbe4b458100f662a68a7  ppc64-diag-2.6.3.tar.gz
+76659055e38705588179a454c57a6790  ppc64-diag-2.6.4.tar.gz