From 37793ba92a6ba5400c54871ff2153188f07d6dce Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Fri, 5 Aug 2011 18:38:41 +0200 Subject: [PATCH] updated to latest upstream 1.2.10 --- .gitignore | 1 + powerpc-utils-1.2.6-man.patch | 467 ++++++++++++++++++++++++++++++++++ powerpc-utils.spec | 24 +- sources | 2 +- 4 files changed, 487 insertions(+), 7 deletions(-) create mode 100644 powerpc-utils-1.2.6-man.patch diff --git a/.gitignore b/.gitignore index f0e255e..6db1cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ powerpc-utils-1.2.2.tar.gz /powerpc-utils-1.2.6.tar.gz +/powerpc-utils-1.2.10.tar.gz diff --git a/powerpc-utils-1.2.6-man.patch b/powerpc-utils-1.2.6-man.patch new file mode 100644 index 0000000..3a94372 --- /dev/null +++ b/powerpc-utils-1.2.6-man.patch @@ -0,0 +1,467 @@ +diff -up powerpc-utils-1.2.6/man/drmgr.8.man powerpc-utils-1.2.6/man/drmgr.8 +--- powerpc-utils-1.2.6/man/drmgr.8.man 2011-02-03 15:42:10.822197001 +0100 ++++ powerpc-utils-1.2.6/man/drmgr.8 2010-10-05 15:04:41.000000000 +0200 +@@ -0,0 +1,60 @@ ++.TH DRMGR "8" "Oct 2010" "Linux" "Linux on Power Service Tools" ++.SH NAME ++drmgr \- Dynamic Resource Manager. Utility used to perform DLPAR operations on a client partition. ++ ++.SH SYNOPSIS ++.B drmgr ++.RB [ \-w ++.IR minutes ] ++.RB [ \-d ++.IR detail_level ] ++.RB [ \-C | \-\-capabilities ] ++.RB [ \-h | \-\-help ] ++ ++.B drmgr ++.RB { \-c " {" port " | " slot " | " phb " | " pci " | " mem " | " cpu } ++.RB | \-m } ++ ++.B drmgr \-c ++.RB { port " | " slot " | " phb } ++.RB { \-a " | " \-r " | " \-Q "} " \-s ++.I drc_name ++ ++.B drmgr \-c pci \-s ++.I slot ++.RB { \-i " | " \-a " [" \-I "] | " \-r " [" \-I "] | " \-R " [" \-I "]}" ++ ++.B drmgr \-c mem ++.RB { \-a " | " \-r "} {" \-q ++.I quantity ++.BR \-p ++.RI { variable_weight " | " ent_capacity "} |" ++.RB { \-q ++.I quantity ++.RB "| " \-s ++.IR drc_name }} ++ ++.B drmgr \-c cpu ++.RB { \-a " | " \-r "} {" \-q ++.I quantity ++.BR \-p ++.RI { variable_weight " | " ent_capacity } ++.RB [ \-s ++.IR drc_names ] ++ ++ ++ ++.SH OVERVIEW ++.B drmgr ++program is a member of the ppc64-utils suite of utils. ++Use it to list DLPAR and hotplug capable slots. ++ ++.SH DESCRIPTION ++.B drmgr ++is a utility to list DLPAR and hotplug capable slots. ++ ++.SH AUTHOR ++.B drmgr ++was written by IBM Corporation ++.PP ++This manual page was written by Roman Rakus +diff -up powerpc-utils-1.2.6/man/lsdevinfo.8.man powerpc-utils-1.2.6/man/lsdevinfo.8 +--- powerpc-utils-1.2.6/man/lsdevinfo.8.man 2011-02-03 15:42:10.824197001 +0100 ++++ powerpc-utils-1.2.6/man/lsdevinfo.8 2010-10-05 15:04:41.000000000 +0200 +@@ -0,0 +1,39 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. ++.TH LSDEVINFO "8" "October 2010" "Linux" "Linux on Power Service Tools" ++.SH NAME ++lsdevinfo - information on Virtual devices ++ ++.SH SYNOPSIS ++.B lsdevinfo ++[\fI-q criteria\fR] [\fI-F format\fR] [\fI-R\fR] [\fI-c\fR] [\fI-h\fR] ++ ++.SH DESCRIPTION ++Provide information on Virtual devices ++.PP ++ ++.SH OPTIONS ++.TP ++\fB\-q\fR criteria ++Specifies a criteria to select which devices are to be displayed. ++.TP ++\fB\-F\fR format ++Specifies the set of attributes to be displayed. ++.TP ++\fB\-R\fR ++Recursively display children of selected devices ++.TP ++\fB\-c\fR ++Display output as a comma separated list for each device. ++.TP ++\fB\-V\fR ++Display version information and exit ++.TP ++\fB\-h\fR ++Display help information and exit ++ ++.SH AUTHOR ++.B lsdevinfo ++was written by Santiago Leon . ++.PP ++This manual page was written by Roman Rakus . ++ +diff -up powerpc-utils-1.2.6/man/lsprop.8.man powerpc-utils-1.2.6/man/lsprop.8 +--- powerpc-utils-1.2.6/man/lsprop.8.man 2011-02-03 15:42:10.825197001 +0100 ++++ powerpc-utils-1.2.6/man/lsprop.8 2010-09-21 15:16:31.000000000 +0200 +@@ -0,0 +1,42 @@ ++.TH LSPROP "8" "Sep 2010" "Linux" "Linux on Power Service Tools" ++.SH NAME ++lsprop \- list properties ++.SH SYNOPSIS ++.B lsprop ++.RB [ \-R ] ++.RB [ \-m ++.IR max-bytes ] ++.RB [ \-w ++.IR num-words ] ++.RI [ FILE .\|.\|.] ++.SH OVERVIEW ++.B lsprop ++program is a member of the ppc64-utils suite of utils. ++Use it to list properties ++ ++.SH DESCRIPTION ++.B lsprop ++displays properties for ++.IR FILE s ++like Open Firmware ++.I .properties ++word. ++If the ++.I FILE ++is not set, the current directory is used. ++ ++.SH OPTIONS ++.TP ++.B \-R ++Process recursively ++.TP ++.BI \-m " max-bytes" ++Read only first ++.I max-bytes ++bytes from the ++.IR FILE s ++.TP ++.BI \-w " num-words" ++Display up to ++.I num-words ++words per line +diff -up powerpc-utils-1.2.6/man/lsslot.8.man powerpc-utils-1.2.6/man/lsslot.8 +--- powerpc-utils-1.2.6/man/lsslot.8.man 2011-02-03 15:42:10.827197001 +0100 ++++ powerpc-utils-1.2.6/man/lsslot.8 2010-10-05 15:04:41.000000000 +0200 +@@ -0,0 +1,52 @@ ++.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 +diff -up powerpc-utils-1.2.6/man/ls-vdev.8.man powerpc-utils-1.2.6/man/ls-vdev.8 +--- powerpc-utils-1.2.6/man/ls-vdev.8.man 2011-02-03 15:42:10.828197001 +0100 ++++ powerpc-utils-1.2.6/man/ls-vdev.8 2010-10-05 15:04:41.000000000 +0200 +@@ -0,0 +1,25 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. ++.TH LS-VDEV "8" "October 2010" "Linux" "Linux on Power Service Tools" ++.SH NAME ++ls-vdev \- information on Virtual SCSI adapters and devices ++.SH SYNOPSIS ++.BR ls-vdev " [" \-h " | " -V ] ++ ++.SH DESCRIPTION ++Provide information on Virtual SCSI adapters and devices ++.PP ++ ++.SH OPTIONS ++.TP ++\fB\-V\fR ++Display version information and exit ++.TP ++\fB\-h\fR ++Display help information and exit ++.PP ++ ++.SH AUTHOR ++.B ls-vdev ++was written by Brian King . ++.PP ++This manual page was written by Roman Rakus . +diff -up powerpc-utils-1.2.6/man/ls-veth.8.man powerpc-utils-1.2.6/man/ls-veth.8 +--- powerpc-utils-1.2.6/man/ls-veth.8.man 2011-02-03 15:42:10.830197001 +0100 ++++ powerpc-utils-1.2.6/man/ls-veth.8 2010-10-05 15:04:41.000000000 +0200 +@@ -0,0 +1,25 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. ++.TH LS-VETH "8" "October 2010" "Linux" "Linux on Power Service Tools" ++.SH NAME ++ls-veth \- information on Virtual Ethernet devices ++.SH SYNOPSIS ++.BR ls-veth " [" \-h " | " -V ] ++ ++.SH DESCRIPTION ++Provide information on Virtual Ethernet devices ++.PP ++ ++.SH OPTIONS ++.TP ++\fB\-V\fR ++Display version information and exit ++.TP ++\fB\-h\fR ++Display help information and exit ++.PP ++ ++.SH AUTHOR ++.B ls-veth ++was written by Brian King . ++.PP ++This manual page was written by Roman Rakus . +diff -up powerpc-utils-1.2.6/man/ls-vscsi.8.man powerpc-utils-1.2.6/man/ls-vscsi.8 +--- powerpc-utils-1.2.6/man/ls-vscsi.8.man 2011-02-03 15:42:10.832197001 +0100 ++++ powerpc-utils-1.2.6/man/ls-vscsi.8 2010-10-05 15:04:41.000000000 +0200 +@@ -0,0 +1,25 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. ++.TH LS-VSCSI "8" "October 2010" "Linux" "Linux on Power Service Tools" ++.SH NAME ++ls-vscsi \- information on Virtual devices ++.SH SYNOPSIS ++.BR ls-vscsi " [" \-h " | " -V ] ++ ++.SH DESCRIPTION ++Provide information on Virtual devices ++.PP ++ ++.SH OPTIONS ++.TP ++\fB\-V\fR ++Display version information and exit ++.TP ++\fB\-h\fR ++Display help information and exit ++.PP ++ ++.SH AUTHOR ++.B ls-vscsi ++was written by Brian King . ++.PP ++This manual page was written by Roman Rakus . +diff -up powerpc-utils-1.2.10/man/Makefile.am.man powerpc-utils-1.2.10/man/Makefile.am +--- powerpc-utils-1.2.10/man/Makefile.am.man 2011-06-17 08:22:44.869137058 +0200 ++++ powerpc-utils-1.2.10/man/Makefile.am 2011-06-17 08:23:54.264930370 +0200 +@@ -2,5 +2,6 @@ dist_man_MANS = activate_firmware.8 rtas + uesensor.8 amsstat.1 serv_config.8 \ + update_flash.8 nvram.8 set_poweron_time.8 \ + usysattn.8 bootlist.8 ofpathname.8 snap.8 usysident.8 \ +- hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 +- ++ hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 \ ++ lsdevinfo.8 rtas_event_decode.8 ls-vdev.8 lsslot.8 lsprop.8 \ ++ drmgr.8 ls-veth.8 ppc64_cpu.8 nvsetenv.8 ls-vscsi.8 +diff -up powerpc-utils-1.2.10/man/Makefile.in.man powerpc-utils-1.2.10/man/Makefile.in +--- powerpc-utils-1.2.10/man/Makefile.in.man 2011-06-17 08:22:55.078436059 +0200 ++++ powerpc-utils-1.2.10/man/Makefile.in 2011-06-17 08:23:49.319676304 +0200 +@@ -137,7 +137,9 @@ dist_man_MANS = activate_firmware.8 rtas + uesensor.8 amsstat.1 serv_config.8 \ + update_flash.8 nvram.8 set_poweron_time.8 \ + usysattn.8 bootlist.8 ofpathname.8 snap.8 usysident.8 \ +- hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 ++ hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 \ ++ lsdevinfo.8 rtas_event_decode.8 ls-vdev.8 lsslot.8 lsprop.8 \ ++ drmgr.8 ls-veth.8 ppc64_cpu.8 nvsetenv.8 ls-vscsi.8 + + all: all-am + +diff -up powerpc-utils-1.2.6/man/nvsetenv.8.man powerpc-utils-1.2.6/man/nvsetenv.8 +--- powerpc-utils-1.2.6/man/nvsetenv.8.man 2011-02-03 15:42:10.833197001 +0100 ++++ powerpc-utils-1.2.6/man/nvsetenv.8 2011-02-03 15:22:37.651197000 +0100 +@@ -0,0 +1,29 @@ ++.TH NVSETENV "8" "Oct 2010" "Linux" "Linux on Power Service Tools" ++.SH NAME ++nvsetenv \- wrapper to invoke nvram ++ ++.SH SYNOPSIS ++.B nvsetenv ++[ ARG1 ] [ ARG2 ] ++ ++.SH DESCRIPTION ++.B nvsetenv ++is just a wrapper to invoke nvram ++ ++.SH OPTIONS ++ ++Without any argument, nvsetenv calls ++.I nvram --print-config ++ ++With one argument ++.IR ARG1 , ++nvsetenv calls ++.I nvram --print-config=ARG1 ++ ++With two arguments ++.IR "ARG1 ARG2" , ++nvsetenv calls ++.I nvram --update-config ARG1=ARG2 ++ ++.SH "SEE ALSO" ++.IR nvram (8) +diff -up powerpc-utils-1.2.6/man/ppc64_cpu.8.man powerpc-utils-1.2.6/man/ppc64_cpu.8 +--- powerpc-utils-1.2.6/man/ppc64_cpu.8.man 2011-02-03 15:42:10.835197001 +0100 ++++ powerpc-utils-1.2.6/man/ppc64_cpu.8 2010-09-21 15:16:32.000000000 +0200 +@@ -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.6/man/rtas_event_decode.8.man powerpc-utils-1.2.6/man/rtas_event_decode.8 +--- powerpc-utils-1.2.6/man/rtas_event_decode.8.man 2011-02-03 15:42:10.836197001 +0100 ++++ powerpc-utils-1.2.6/man/rtas_event_decode.8 2010-09-21 15:16:32.000000000 +0200 +@@ -0,0 +1,31 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. ++.TH RTAS_EVENT_DECODE 8 "September 2010" "Linux" "Linux on Power Service Tools" ++.SH NAME ++\fBrtas_event_decode\fP - RTAS message decoder ++.SH SYNOPSIS ++.B rtas_event_decode ++[\fI-dv\fR] [\fI-n eventnum\fR] [\fI-w width\fR] ++.SH DESCRIPTION ++RTAS messages are placed in the syslog encoded in a binary ++format, and are unreadable. This tool will take exactly one ++message, parse it, and spit out the human-readable equivalent. ++This program expects ascii data on stdin. ++ ++This tool is mostly meant to be used in conjuction with the ++rtas_dump shell script, which provides a suitable user ++interface. ++ ++.SH OPTIONS ++.TP ++.B \-d ++dump the raw RTAS event ++.TP ++.BI \-n " eventnum" ++event number of the RTAS event being dumped ++.TP ++.B \-v ++verbose, print all details, not just header ++.TP ++.BI \-w " width" ++limit the output to the specified width, default width is 80 characters. The width must be > 0 and < 1024. ++ diff --git a/powerpc-utils.spec b/powerpc-utils.spec index 568cc4f..d14c4a7 100644 --- a/powerpc-utils.spec +++ b/powerpc-utils.spec @@ -1,6 +1,6 @@ Name: powerpc-utils -Version: 1.2.6 -Release: 2%{?dist} +Version: 1.2.10 +Release: 1%{?dist} Summary: Utilities for PowerPC platforms Group: System Environment/Base @@ -17,6 +17,7 @@ ExclusiveArch: ppc ppc64 # This hack is needed only for platforms with autoconf < 2.63 Patch1: powerpc-utils-autoconf.patch +Patch2: powerpc-utils-1.2.6-man.patch # This is done before release of F12 Obsoletes: powerpc-utils-papr < 1.1.6-3 @@ -32,6 +33,7 @@ Utilities for PowerPC platforms. %if 0%{?fedora} < 9 && 0%{?rhel} < 6 %patch1 -p1 -b .aconf %endif +%patch2 -p1 -b .man %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -92,7 +94,7 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/ls-vdev %{_sbindir}/ls-veth %{_sbindir}/ls-vscsi - +%{_sbindir}/lparstat %{_bindir}/amsstat %{_mandir}/man8/update_flash.8* @@ -104,13 +106,20 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/serv_config.8* %{_mandir}/man8/uesensor.8* %{_mandir}/man8/hvcsadmin.8* -%{_mandir}/man8/vscsisadmin.8* -%{_mandir}/man8/ibmvscsis.sh.8* -%{_mandir}/man8/ibmvscsis.conf.8* %{_mandir}/man8/rtas_dump.8* %{_mandir}/man8/sys_ident.8* +%{_mandir}/man8/lparstat.8* %{_mandir}/man5/lparcfg.5* %{_mandir}/man1/amsstat.1* +%{_mandir}/man8/lsdevinfo.8* +%{_mandir}/man8/rtas_event_decode.8* +%{_mandir}/man8/ls-vdev.8* +%{_mandir}/man8/lsslot.8* +%{_mandir}/man8/lsprop.8* +%{_mandir}/man8/drmgr.8* +%{_mandir}/man8/ls-veth.8* +%{_mandir}/man8/ppc64_cpu.8* +%{_mandir}/man8/ls-vscsi.8* %doc README COPYRIGHT Changelog %post @@ -118,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog +* Mon Aug 05 2011 Jiri Skala - 1.2.10-1 +- updated to latest upstream 1.2.10 + * Wed Feb 09 2011 Fedora Release Engineering - 1.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 6289b4e..146e34d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f57c8a1bd2046b9ef738b4968a3d0ce2 powerpc-utils-1.2.6.tar.gz +52a98c5fada4885795238dec4a0908e5 powerpc-utils-1.2.10.tar.gz