Merge commit 'b445c365f682529d1883b4c0bfe52b08b72d90fb'
Conflicts: .gitignore powerpc-utils-1.2.15-man.patch powerpc-utils.spec sources
This commit is contained in:
Karsten Hopp
commit
d3226482a6
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ powerpc-utils-1.2.2.tar.gz
|
||||
/powerpc-utils-1.2.11.tar.gz
|
||||
/powerpc-utils-1.2.12.tar.gz
|
||||
/powerpc-utils-1.2.14.tar.gz
|
||||
/powerpc-utils-1.2.15.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
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
|
||||
diff -up powerpc-utils-1.2.15/man/drmgr.8.man powerpc-utils-1.2.15/man/drmgr.8
|
||||
--- powerpc-utils-1.2.15/man/drmgr.8.man 2013-01-16 15:31:13.886591137 +0100
|
||||
+++ powerpc-utils-1.2.15/man/drmgr.8 2013-01-16 15:31:13.886591137 +0100
|
||||
@@ -0,0 +1,60 @@
|
||||
+.TH DRMGR "8" "Oct 2010" "Linux" "Linux on Power Service Tools"
|
||||
+.SH NAME
|
||||
@ -62,9 +62,9 @@ diff -up powerpc-utils-1.2.6/man/drmgr.8.man powerpc-utils-1.2.6/man/drmgr.8
|
||||
+was written by IBM Corporation
|
||||
+.PP
|
||||
+This manual page was written by Roman Rakus <rrakus@redhat.com>
|
||||
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
|
||||
diff -up powerpc-utils-1.2.15/man/lsdevinfo.8.man powerpc-utils-1.2.15/man/lsdevinfo.8
|
||||
--- powerpc-utils-1.2.15/man/lsdevinfo.8.man 2013-01-16 15:31:13.886591137 +0100
|
||||
+++ powerpc-utils-1.2.15/man/lsdevinfo.8 2013-01-16 15:31:13.886591137 +0100
|
||||
@@ -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"
|
||||
@ -105,9 +105,9 @@ diff -up powerpc-utils-1.2.6/man/lsdevinfo.8.man powerpc-utils-1.2.6/man/lsdevin
|
||||
+.PP
|
||||
+This manual page was written by Roman Rakus <rrakus@redhat.com>.
|
||||
+
|
||||
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
|
||||
diff -up powerpc-utils-1.2.15/man/lsprop.8.man powerpc-utils-1.2.15/man/lsprop.8
|
||||
--- powerpc-utils-1.2.15/man/lsprop.8.man 2013-01-16 15:31:13.886591137 +0100
|
||||
+++ powerpc-utils-1.2.15/man/lsprop.8 2013-01-16 15:31:13.886591137 +0100
|
||||
@@ -0,0 +1,42 @@
|
||||
+.TH LSPROP "8" "Sep 2010" "Linux" "Linux on Power Service Tools"
|
||||
+.SH NAME
|
||||
@ -151,9 +151,68 @@ diff -up powerpc-utils-1.2.6/man/lsprop.8.man powerpc-utils-1.2.6/man/lsprop.8
|
||||
+Display up to
|
||||
+.I num-words
|
||||
+words per line
|
||||
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
|
||||
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 <rrakus@redhat.com>
|
||||
.\"
|
||||
.\" Copyright (C) 2011 International Business Machines
|
||||
.\" Brian King <brking@linux.vnet.ibm.com>
|
||||
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
|
||||
@@ -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"
|
||||
@ -180,9 +239,9 @@ diff -up powerpc-utils-1.2.6/man/ls-vdev.8.man powerpc-utils-1.2.6/man/ls-vdev.8
|
||||
+was written by Brian King <brking@linux.vnet.ibm.com>.
|
||||
+.PP
|
||||
+This manual page was written by Roman Rakus <rrakus@redhat.com>.
|
||||
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
|
||||
diff -up powerpc-utils-1.2.15/man/ls-veth.8.man powerpc-utils-1.2.15/man/ls-veth.8
|
||||
--- powerpc-utils-1.2.15/man/ls-veth.8.man 2013-01-16 15:31:13.887591102 +0100
|
||||
+++ powerpc-utils-1.2.15/man/ls-veth.8 2013-01-16 15:31:13.887591102 +0100
|
||||
@@ -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"
|
||||
@ -209,9 +268,9 @@ diff -up powerpc-utils-1.2.6/man/ls-veth.8.man powerpc-utils-1.2.6/man/ls-veth.8
|
||||
+was written by Brian King <brking@linux.vnet.ibm.com>.
|
||||
+.PP
|
||||
+This manual page was written by Roman Rakus <rrakus@redhat.com>.
|
||||
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
|
||||
diff -up powerpc-utils-1.2.15/man/ls-vscsi.8.man powerpc-utils-1.2.15/man/ls-vscsi.8
|
||||
--- powerpc-utils-1.2.15/man/ls-vscsi.8.man 2013-01-16 15:31:13.887591102 +0100
|
||||
+++ powerpc-utils-1.2.15/man/ls-vscsi.8 2013-01-16 15:31:13.887591102 +0100
|
||||
@@ -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"
|
||||
@ -238,35 +297,36 @@ diff -up powerpc-utils-1.2.6/man/ls-vscsi.8.man powerpc-utils-1.2.6/man/ls-vscsi
|
||||
+was written by Brian King <brking@linux.vnet.ibm.com>.
|
||||
+.PP
|
||||
+This manual page was written by Roman Rakus <rrakus@redhat.com>.
|
||||
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
|
||||
diff -up powerpc-utils-1.2.15/man/Makefile.am.man powerpc-utils-1.2.15/man/Makefile.am
|
||||
--- powerpc-utils-1.2.15/man/Makefile.am.man 2012-12-12 16:29:25.000000000 +0100
|
||||
+++ powerpc-utils-1.2.15/man/Makefile.am 2013-01-16 15:44:18.903758484 +0100
|
||||
@@ -2,5 +2,7 @@ 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 lsslot.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 \
|
||||
bootlist.8 ofpathname.8 snap.8 hvcsadmin.8 \
|
||||
- rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 lsslot.8
|
||||
+ rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 lsslot.8 \
|
||||
+ lsdevinfo.8 rtas_event_decode.8 ls-vdev.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
|
||||
|
||||
diff -up powerpc-utils-1.2.15/man/Makefile.in.man powerpc-utils-1.2.15/man/Makefile.in
|
||||
--- powerpc-utils-1.2.15/man/Makefile.in.man 2012-12-19 16:17:28.000000000 +0100
|
||||
+++ powerpc-utils-1.2.15/man/Makefile.in 2013-01-16 15:44:02.799331647 +0100
|
||||
@@ -137,7 +137,10 @@ 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 lsslot.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 \
|
||||
bootlist.8 ofpathname.8 snap.8 hvcsadmin.8 \
|
||||
- rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 lsslot.8
|
||||
+ rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 lsslot.8 \
|
||||
+ lsdevinfo.8 rtas_event_decode.8 ls-vdev.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
|
||||
diff -up powerpc-utils-1.2.15/man/nvsetenv.8.man powerpc-utils-1.2.15/man/nvsetenv.8
|
||||
--- powerpc-utils-1.2.15/man/nvsetenv.8.man 2013-01-16 15:31:13.887591102 +0100
|
||||
+++ powerpc-utils-1.2.15/man/nvsetenv.8 2013-01-16 15:31:13.887591102 +0100
|
||||
@@ -0,0 +1,29 @@
|
||||
+.TH NVSETENV "8" "Oct 2010" "Linux" "Linux on Power Service Tools"
|
||||
+.SH NAME
|
||||
@ -297,9 +357,9 @@ diff -up powerpc-utils-1.2.6/man/nvsetenv.8.man powerpc-utils-1.2.6/man/nvsetenv
|
||||
+
|
||||
+.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
|
||||
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
|
||||
@ -374,9 +434,9 @@ diff -up powerpc-utils-1.2.6/man/ppc64_cpu.8.man powerpc-utils-1.2.6/man/ppc64_c
|
||||
+This manual page was written by Aur\['e]lien G\['E]R\[^O]ME
|
||||
+<ag@roxor.cx>, for the Debian project (but may be used by others).
|
||||
+Enhanced by Roman Rakus <rrakus@redhat.com>
|
||||
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
|
||||
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
|
||||
@@ -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"
|
||||
@ -1,5 +1,5 @@
|
||||
Name: powerpc-utils
|
||||
Version: 1.2.14
|
||||
Version: 1.2.15
|
||||
Release: 1%{?dist}
|
||||
Summary: Utilities for PowerPC platforms
|
||||
|
||||
@ -8,7 +8,6 @@ License: CPL
|
||||
URL: http://sourceforge.net/projects/%{name}/
|
||||
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source1: nvsetenv
|
||||
Patch0: powerpc-utils-1.2.12-ofpathname-884826.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: zlib-devel doxygen automake librtas-devel libservicelog-devel >= 1.0.1-2
|
||||
|
||||
@ -17,8 +16,8 @@ Requires: libservicelog bc which
|
||||
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
|
||||
Patch0: powerpc-utils-autoconf.patch
|
||||
Patch1: powerpc-utils-1.2.15-man.patch
|
||||
|
||||
# This is done before release of F12
|
||||
Obsoletes: powerpc-utils-papr < 1.1.6-3
|
||||
@ -31,13 +30,12 @@ Utilities for PowerPC platforms.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
# This hack is needed only for platforms with autoconf < 2.63
|
||||
%if 0%{?fedora} < 9 && 0%{?rhel} < 6
|
||||
%patch1 -p1 -b .aconf
|
||||
%patch0 -p1 -b .aconf
|
||||
%endif
|
||||
%patch2 -p1 -b .man
|
||||
%patch1 -p1 -b .man
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
@ -83,8 +81,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%{_sbindir}/update_flash
|
||||
%{_sbindir}/activate_firmware
|
||||
%{_sbindir}/usysident
|
||||
%{_sbindir}/usysattn
|
||||
%{_sbindir}/set_poweron_time
|
||||
%{_sbindir}/rtas_ibm_get_vpd
|
||||
%{_sbindir}/serv_config
|
||||
@ -103,8 +99,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/amsstat
|
||||
%{_mandir}/man8/update_flash.8*
|
||||
%{_mandir}/man8/activate_firmware.8*
|
||||
%{_mandir}/man8/usysident.8*
|
||||
%{_mandir}/man8/usysattn.8*
|
||||
%{_mandir}/man8/set_poweron_time.8*
|
||||
%{_mandir}/man8/rtas_ibm_get_vpd.8*
|
||||
%{_mandir}/man8/serv_config.8*
|
||||
@ -131,6 +125,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%preun
|
||||
|
||||
%changelog
|
||||
* Wed Jan 16 2013 Karsten Hopp <karsten@redhat.com> 1.2.15-1
|
||||
- update to 1.2.15
|
||||
- usysident/usysattn got moved to ppc64-diag package
|
||||
- multipath ofpathname patch removed as it is upstream now
|
||||
|
||||
* Tue Dec 18 2012 Filip Kocina <fkocina@redhat.com> 1.2.14-1
|
||||
- Resolves: #859222 - updated to latest upstream 1.2.14
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user