From c14f3fe6dc0de65e6823cb92e1d6eccfe88af545 Mon Sep 17 00:00:00 2001 From: Rafael Fonseca Date: Mar 21 2016 10:29:56 +0000 Subject: Update to latest upstream 1.3.0 Signed-off-by: Rafael Fonseca Signed-off-by: Vasant Hegde --- diff --git a/.gitignore b/.gitignore index 7cb29e4..6811fe3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ powerpc-utils-1.2.2.tar.gz /powerpc-utils-1.2.23.tar.gz /powerpc-utils-1.2.24.tar.gz /powerpc-utils-1.2.27.tar.gz +/v1.3.0.tar.gz diff --git a/powerpc-utils-1.2.15-man.patch b/powerpc-utils-1.2.15-man.patch index 76c9071..6b92e65 100644 --- a/powerpc-utils-1.2.15-man.patch +++ b/powerpc-utils-1.2.15-man.patch @@ -151,65 +151,6 @@ diff -up powerpc-utils-1.2.15/man/lsprop.8.man powerpc-utils-1.2.15/man/lsprop.8 +Display up to +.I num-words +words per line -diff -up powerpc-utils-1.2.15/man/lsslot.8.man powerpc-utils-1.2.15/man/lsslot.8 ---- powerpc-utils-1.2.15/man/lsslot.8.man 2012-12-12 16:10:48.000000000 +0100 -+++ powerpc-utils-1.2.15/man/lsslot.8 2013-01-16 15:31:13.886591137 +0100 -@@ -1,3 +1,55 @@ -+.TH LSSLOT "8" "Oct 2010" "Linux" "Linux on Power Service Tools" -+.SH NAME -+lsslot \- Utility to list DLPAR and hotplug capable slots. -+ -+.SH SYNOPSIS -+.B lsprop -+.RB [ \-c " | " \-a " | " \-b " | " \-p " | " \-o " | " \-s " | " \-F " | " \-d " | " \-w ] -+ -+.SH OVERVIEW -+.B lsslot -+program is a member of the ppc64-utils suite of utils. -+Use it to list DLPAR and hotplug capable slots. -+ -+.SH DESCRIPTION -+.B lsslot -+is a utility to list DLPAR and hotplug capable slots. -+ -+.SH OPTIONS -+.TP -+.BI \-c " connector type" -+Display the slots of the specified connector type. The valid connector types -+are "pci" for hotplg PCI slots, "slot" for logical slots, "phb" fot PHB's -+and "cpu" for cpu's. The default is "slot" if no -c option is specified. -+.TP -+.B \-a -+Display available slots, valid for "pci" slots only. -+.TP -+.B \-b -+Display cpu's and caches, valid for "cpu" only. -+.TP -+.B \-o -+Display occupied slots, valid for "pci" slots only. -+.TP -+.B \-p -+Display caches, valid for "cpu" slots only. -+.BI \-s " slot" -+Display characteristics of the specified slot. -+.TP -+.BI \-F " delimiter" -+Specified a single character to delimit the output. The heading is not -+displayed and the columns are delimited by the specified character. -+.TP -+.B \-d -+Enable debugging output. -+.TP -+.BI \-w " timeout" -+Specify a timeout when attempting to acquire locks. -+.SH AUTHOR -+.B lsslot -+was written by IBM Corporation -+.PP -+This manual page was written by Roman Rakus - .\" - .\" Copyright (C) 2011 International Business Machines - .\" Brian King diff -up powerpc-utils-1.2.15/man/ls-vdev.8.man powerpc-utils-1.2.15/man/ls-vdev.8 --- powerpc-utils-1.2.15/man/ls-vdev.8.man 2013-01-16 15:31:13.886591137 +0100 +++ powerpc-utils-1.2.15/man/ls-vdev.8 2013-01-16 15:31:13.886591137 +0100 @@ -330,83 +271,6 @@ diff -up powerpc-utils-1.2.15/man/nvsetenv.8.man powerpc-utils-1.2.15/man/nvsete + +.SH "SEE ALSO" +.IR nvram (8) -diff -up powerpc-utils-1.2.15/man/ppc64_cpu.8.man powerpc-utils-1.2.15/man/ppc64_cpu.8 ---- powerpc-utils-1.2.15/man/ppc64_cpu.8.man 2013-01-16 15:31:13.888591067 +0100 -+++ powerpc-utils-1.2.15/man/ppc64_cpu.8 2013-01-16 15:31:13.887591102 +0100 -@@ -0,0 +1,73 @@ -+.TH PPC64_CPU 8 "21 August 2007" "Linux" "Linux on Power Service Tools" -+.SH NAME -+\fBppc64_cpu\fP \- cpu settings utility -+.SH SYNOPSIS -+.nf -+\fB/usr/sbin/ppc64_cpu\fP --smt -+\fB/usr/sbin/ppc64_cpu\fP --smt={on|off} -+\fB/usr/sbin/ppc64_cpu\fP --smt=X -+.PP -+\fB/usr/sbin/ppc64_cpu\fP --cores-present -+\fB/usr/sbin/ppc64_cpu\fP --cores-on -+\fB/usr/sbin/ppc64_cpu\fP --cores-on=X -+.PP -+\fB/usr/sbin/ppc64_cpu\fP --dscr -+\fB/usr/sbin/ppc64_cpu\fP --dscr= -+.PP -+\fB/usr/sbin/ppc64_cpu\fP --smt-snooze-delay -+\fB/usr/sbin/ppc64_cpu\fP --smt-snooze-delay= -+.PP -+\fB/usr/sbin/ppc64_cpu\fP --run-mode -+\fB/usr/sbin/ppc64_cpu\fP --run-mode= -+.PP -+\fB/usr/sbin/ppc64_cpu\fP --frequency -+.fi -+.SH DESCRIPTION -+This utility allows users to view and set the cpu SMT, cores, DSCR, -+smt-snooze-delay, run mode and frequency settings. -+.SH OPTIONS -+.TP -+.B \--smt -+Get current SMT state. -+.TP -+.B \--smt={on|off} -+Turn SMT on/off. -+.TP -+.B \--smt=X -+Set SMT state to X. -+.TP -+.B \--cores-present -+Get the number of cores installed. -+.TP -+.B \--cores-on -+Get the number of cores currently online. -+.TP -+.B \--cores-on=X -+Put exactly X cores online. -+.TP -+.B \--dscr -+Get current DSCR setting. -+.TP -+.B \--dscr= -+Change DSCR setting. -+.TP -+.B \--smt-snooze-delay -+Get current smt-snooze-delay setting. -+.TP -+.B \--smt-snooze-delay= -+Change smt-snooze-delay setting. -+.TP -+.B \--run-mode -+Get current diagnostics run mode -+.TP -+.B \--run-mode= -+Set current diagnostics run mode -+.TP -+.B \--frequency -+Determine cpu frequency -+.SH AUTHOR -+\fBppc64_cpu\fP was written by Anton Blanchard. -+.PP -+This manual page was written by Aur\['e]lien G\['E]R\[^O]ME -+, for the Debian project (but may be used by others). -+Enhanced by Roman Rakus diff -up powerpc-utils-1.2.15/man/rtas_event_decode.8.man powerpc-utils-1.2.15/man/rtas_event_decode.8 --- powerpc-utils-1.2.15/man/rtas_event_decode.8.man 2013-01-16 15:31:13.888591067 +0100 +++ powerpc-utils-1.2.15/man/rtas_event_decode.8 2013-01-16 15:31:13.888591067 +0100 diff --git a/powerpc-utils-1.2.27-makefile.patch b/powerpc-utils-1.2.27-makefile.patch index 4e56105..54adaf2 100644 --- a/powerpc-utils-1.2.27-makefile.patch +++ b/powerpc-utils-1.2.27-makefile.patch @@ -7,7 +7,7 @@ Signed-off-by: Vasant Hegde --- Makefile.am | 10 +++++++++- Makefile.in | 10 +++++++++- - 2 files changed, 18 insertions(+), 2 deletions(-) + 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index e6be23e..b521794 100644 @@ -30,27 +30,6 @@ index e6be23e..b521794 100644 EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) -diff --git a/Makefile.in b/Makefile.in -index 3d8c1fc..efa7c7d 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -505,7 +505,15 @@ man_MANS = \ - man/lsslot.8 \ - man/ppc64_cpu.8 \ - man/errinjct.8 \ -- man/rtas_dbg.8 -+ man/rtas_dbg.8 \ -+ man/lsdevinfo.8 \ -+ man/rtas_event_decode.8 \ -+ man/ls-vdev.8 \ -+ man/lsprop.8 \ -+ man/drmgr.8 \ -+ man/ls-veth.8 \ -+ man/nvsetenv.8 \ -+ man/ls-vscsi.8 - - pseries_platform_SOURCES = src/common/pseries_platform.c src/common/pseries_platform.h - librtas_error_SOURCES = src/common/librtas_error.c src/common/librtas_error.h -- 2.1.0 diff --git a/powerpc-utils-errinjct-Add-format-specificer.patch b/powerpc-utils-errinjct-Add-format-specificer.patch deleted file mode 100644 index e7463b0..0000000 --- a/powerpc-utils-errinjct-Add-format-specificer.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 484a8539fa4b4b677a0e496f8e41ba5f8da40b02 Mon Sep 17 00:00:00 2001 -From: Vasant Hegde -Date: Mon, 16 Nov 2015 18:51:24 +0530 -Subject: [PATCH] errinjct: Add format specificer - -We hit below build warning with "-Werror=format-security" compilation option. - - CC src/errinjct/icache.o - src/errinjct/errinjct.c: In function 'perr': - src/errinjct/errinjct.c:240:18: error: format not a string literal and no format arguments [-Werror=format-security] - fprintf(stderr, buf); - ^ - -Signed-off-by: Vasant Hegde ---- - src/errinjct/errinjct.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/errinjct/errinjct.c b/src/errinjct/errinjct.c -index 509f8e8..7133cca 100644 ---- a/src/errinjct/errinjct.c -+++ b/src/errinjct/errinjct.c -@@ -237,7 +237,7 @@ void perr(int error, const char *fmt, ...) - - buf[len] = '\0'; - -- fprintf(stderr, buf); -+ fprintf(stderr, "%s\n", buf); - fflush(stderr); - } - --- -2.1.0 - diff --git a/powerpc-utils.spec b/powerpc-utils.spec index a74039d..587567d 100644 --- a/powerpc-utils.spec +++ b/powerpc-utils.spec @@ -1,15 +1,15 @@ Name: powerpc-utils -Version: 1.2.27 -Release: 3%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Utilities for PowerPC platforms Group: System Environment/Base -License: CPL -URL: http://sourceforge.net/projects/%{name}/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +License: GPLv2 +URL: https://github.com/nfont/%{name}/ +Source0: https://github.com/nfont/%{name}/archive/v%{version}.tar.gz Source1: nvsetenv BuildRequires: zlib-devel doxygen automake librtas-devel libservicelog-devel >= 1.0.1-2 -BuildRequires: librtas-devel >= 1.3.9 +BuildRequires: librtas-devel >= 1.4.0 # should be fixed - libservicelog is not right name Requires: libservicelog bc which @@ -21,7 +21,6 @@ ExclusiveArch: ppc ppc64 ppc64le Patch0: powerpc-utils-autoconf.patch Patch1: powerpc-utils-1.2.15-man.patch Patch2: powerpc-utils-1.2.27-makefile.patch -Patch3: powerpc-utils-errinjct-Add-format-specificer.patch # This is done before release of F12 Obsoletes: powerpc-utils-papr < 1.1.6-3 @@ -42,10 +41,10 @@ Utilities for PowerPC platforms. %patch1 -p1 -b .man %patch2 -p1 -b .makefile -%patch3 -p1 -b .errinjct-Add-format-specificer %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +./autogen.sh %configure make %{?_smp_mflags} @@ -129,9 +128,15 @@ ln -s nvram.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/nvsetenv.8.gz %{_mandir}/man8/ls-vscsi.8* %{_mandir}/man8/errinjct.8* %{_mandir}/man8/rtas_dbg.8* -%doc README COPYRIGHT Changelog +%doc README COPYING Changelog %changelog +* Thu Feb 18 2016 Rafael Fonseca - 1.3.0-1 +- Update to latest upstream 1.3.0 +- Update upstream URL. +- Change license to GPL. +- Remove deprecated patch. + * Thu Feb 04 2016 Fedora Release Engineering - 1.2.27-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 155e0c7..ec4bae2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -544511021c88fa973887a0235392d7b1 powerpc-utils-1.2.27.tar.gz +ceed76fa882ea02d78e574691e167834 v1.3.0.tar.gz