diff --git a/.gitignore b/.gitignore index c3a50b5..d6568f5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /ppc64-diag-2.6.6.tar.gz /ppc64-diag-2.6.7.tar.gz /ppc64-diag-2.6.10.tar.gz +/ppc64-diag-2.7.0.tar.gz diff --git a/ppc64-diag-scriptlocation.patch b/ppc64-diag-scriptlocation.patch index 8fa0361..b3ef97f 100644 --- a/ppc64-diag-scriptlocation.patch +++ b/ppc64-diag-scriptlocation.patch @@ -1,6 +1,6 @@ -From 6a9764f7d872c415d0e378254c9d0eae126514a6 Mon Sep 17 00:00:00 2001 +From ee0ceb1cf421409c2839a70925c7947bedabae73 Mon Sep 17 00:00:00 2001 From: Vasant Hegde -Date: Thu, 25 Sep 2014 17:01:20 +0530 +Date: Mon, 21 Mar 2016 16:19:10 +0530 Subject: [PATCH] Update script location Signed-off-by: Vasant Hegde @@ -34,7 +34,7 @@ index 1ab0d2c..9a3acf5 100644 @$(call uninstall_files,$(SERVICE_SCRIPT),755,$(DESTDIR)/$(SYSTEMD_DIR)) @$(call uninstall_files,$(CFG_FILES),$(DESTDIR)/etc/ppc64-diag) diff --git a/scripts/ppc64_diag_mkrsrc b/scripts/ppc64_diag_mkrsrc -index 93dac2f..6db33d8 100755 +index bf3c5f5..6023a71 100755 --- a/scripts/ppc64_diag_mkrsrc +++ b/scripts/ppc64_diag_mkrsrc @@ -1,4 +1,4 @@ @@ -43,9 +43,9 @@ index 93dac2f..6db33d8 100755 # # This script is to be registered with servicelog as a notification tool. It # is responsible for creating a new IBM.ServiceEvent RMC resource when a -@@ -14,7 +14,7 @@ - # Copyright (C) 2005, 2007 IBM Corporation - # +@@ -27,7 +27,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require "/etc/ppc64-diag/servevent_parse.pl"; +require "/usr/libexec/ppc64-diag/servevent_parse.pl"; @@ -53,7 +53,7 @@ index 93dac2f..6db33d8 100755 # Check to make sure that devices.chrp.base.ServiceRM is installed $rc = system("which rpm >/dev/null 2>&1"); diff --git a/scripts/ppc64_diag_notify b/scripts/ppc64_diag_notify -index 0374864..9730d06 100755 +index 9f198d9..87fc384 100755 --- a/scripts/ppc64_diag_notify +++ b/scripts/ppc64_diag_notify @@ -1,4 +1,4 @@ @@ -62,7 +62,7 @@ index 0374864..9730d06 100755 # # This script is to be registered with servicelog as a notification tool. It # is responsible for sending out e-mail notifications of new ppc64 platform -@@ -9,7 +9,7 @@ +@@ -22,7 +22,7 @@ use Getopt::Long; @@ -72,7 +72,7 @@ index 0374864..9730d06 100755 sub usage { print "$0 [OPTIONS]\n"; diff --git a/scripts/ppc64_diag_servagent b/scripts/ppc64_diag_servagent -index 917f0c3..b1a4a31 100755 +index 4f45983..9966302 100755 --- a/scripts/ppc64_diag_servagent +++ b/scripts/ppc64_diag_servagent @@ -1,4 +1,4 @@ @@ -81,9 +81,9 @@ index 917f0c3..b1a4a31 100755 # # This script is to be registered with servicelog as a notification tool. It # is responsible for invoking Electronic Service Agent in response to a -@@ -12,7 +12,7 @@ - # Copyright (C) 2007 IBM Corporation - # +@@ -25,7 +25,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require "/etc/ppc64-diag/servevent_parse.pl"; +require "/usr/libexec/ppc64-diag/servevent_parse.pl"; @@ -91,10 +91,10 @@ index 917f0c3..b1a4a31 100755 if (!-e "/usr/svcagent/bin/callsa2") { # eSA is not installed; exit quietly diff --git a/scripts/ppc64_diag_setup b/scripts/ppc64_diag_setup -index b9b691b..091ef55 100755 +index 283c357..2c80c5c 100755 --- a/scripts/ppc64_diag_setup +++ b/scripts/ppc64_diag_setup -@@ -76,15 +76,15 @@ sub unregister { +@@ -89,15 +89,15 @@ sub unregister { @notification_tools = ( @@ -114,10 +114,10 @@ index b9b691b..091ef55 100755 "--type=EVENT --method=pairs_stdin"], ); diff --git a/scripts/rtas_errd b/scripts/rtas_errd -index c8f9deb..c4cf03a 100755 +index d5d40fe..fd9d5d2 100755 --- a/scripts/rtas_errd +++ b/scripts/rtas_errd -@@ -56,7 +56,7 @@ case "$1" in +@@ -66,7 +66,7 @@ case "$1" in echo "registering ppc64-diag with system" rm -f /var/cache/ppc64-diag.registered mkdir -v /var/cache/ppc64-diag.registered @@ -127,5 +127,5 @@ index c8f9deb..c4cf03a 100755 echo -n "Starting rtas_errd (platform error handling) daemon: " if [ $INSSERV -eq 1 ]; then -- -1.8.3.1 +2.5.0 diff --git a/ppc64-diag.spec b/ppc64-diag.spec index 9d13219..357063f 100644 --- a/ppc64-diag.spec +++ b/ppc64-diag.spec @@ -1,21 +1,21 @@ Name: ppc64-diag -Version: 2.6.10 -Release: 2%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: PowerLinux Platform Diagnostics URL: http://sourceforge.net/projects/linux-diag/files/ppc64-diag/ Group: System Environment/Base -License: EPL +License: GPLv2 ExclusiveArch: ppc ppc64 ppc64le BuildRequires: libservicelog-devel, flex, perl, byacc BuildRequires: libvpd-devel, systemd-units BuildRequires: ncurses-devel -BuildRequires: librtas-devel >= 1.3.9 +BuildRequires: librtas-devel >= 1.4.0 BuildRequires: systemd-devel Requires: servicelog, lsvpd # PCI hotplug support on PowerKVM guest depends on below # powerpc-utils version. -Requires: powerpc-utils >= 1.2.19 +Requires: powerpc-utils >= 1.3.0 Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/%{version}/%{name}-%{version}.tar.gz Patch0: ppc64-diag-messagecatalog-location.patch @@ -52,8 +52,8 @@ make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT -chmod 644 COPYRIGHT -rm -f $RPM_BUILD_ROOT/usr/share/doc/packages/ppc64-diag/COPYRIGHT +chmod 644 COPYING +rm -f $RPM_BUILD_ROOT/usr/share/doc/packages/ppc64-diag/COPYING mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_unitdir} mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ses_pages @@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr (-,root,root,-) -%doc COPYRIGHT +%doc COPYING %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/ses_pages %dir %{_var}/log/dump @@ -129,6 +129,10 @@ fi %changelog +* Mon Mar 21 2016 Vasant Hegde - 2.7.0 +- Update to latest upstream 2.7.0 +- Change license to GPLv2 + * Thu Feb 04 2016 Fedora Release Engineering - 2.6.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 27e11ed..23588cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f7e517849729e79aa39c4c4824bf395 ppc64-diag-2.6.10.tar.gz +e883ffb0671ef8078febb7f4f79434a9 ppc64-diag-2.7.0.tar.gz