From c7163fe768e44f0bd5272fbf4765b9091b8ddce4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:53:14 +0000 Subject: [PATCH 01/14] makefile update to properly grab makefile.common --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 19c6f21..2678099 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,19 @@ NAME := iprutils SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From 4b854828c538db0516a923d2e0c63977542b0c9a Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 16 Nov 2007 23:00:57 +0000 Subject: [PATCH 02/14] - Upgrade to latest upstream release --- .cvsignore | 12 +----------- iprutils.spec | 46 +++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/.cvsignore b/.cvsignore index 79113a3..689ca11 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,11 +1 @@ -iprutils-2.0.12-src.tgz -sysfsutils-1.1.0.tar.gz -iprutils-2.0.13-src.tgz -iprutils-2.0.13.5-src.tgz -iprutils-2.0.13.7-src.tgz -iprutils-2.0.14-src.tgz -iprutils-2.0.15.3-src.tgz -iprutils-2.1.1-src.tgz -iprutils-2.1.4-src.tgz -iprutils-2.1.5-src.tgz -iprutils-2.2.6-src.tgz +iprutils-2.2.8-src.tgz diff --git a/iprutils.spec b/iprutils.spec index fe5a659..c5ffa01 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,21 +1,25 @@ -ExclusiveArch: ppc ppc64 Summary: Utilities for the IBM Power Linux RAID adapters -Name: iprutils -Version: 2.2.6 -Release: 3%{?dist} +Name: iprutils +Version: 2.2.8 +Release: 1%{?dist} License: CPL -Group: System Environment/Base -Source0: iprutils-%{version}-src.tgz -Patch0: iprutils-cflags.patch -Patch1: iprutils-lsb-init-ectomy.patch -URL: http://sourceforge.net/projects/iprdd/ -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Obsoletes: ipr-utils +Group: System Environment/Base +URL: http://sourceforge.net/projects/iprdd/ + +Source0: http://osdn.dl.sourceforge.net/sourceforge/iprdd/%{name}-%{version}-src.tgz +Patch0: %{name}-cflags.patch +Patch1: %{name}-lsb-init-ectomy.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveArch: ppc ppc64 + BuildRequires: libsysfs-devel BuildRequires: pciutils-devel BuildRequires: ncurses-devel BuildRequires: libcap-devel +Obsoletes: ipr-utils + %description Provides a suite of utilities to manage and configure SCSI devices supported by the ipr SCSI storage device driver. @@ -26,15 +30,16 @@ supported by the ipr SCSI storage device driver. %patch1 -p1 %build -CFLAGS=$RPM_OPT_FLAGS make +CFLAGS="%{optflags}" %{__make} %install -rm -rf $RPM_BUILD_ROOT -make INSTALL_MOD_PATH=$RPM_BUILD_ROOT install -install -d $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d -install -m 755 init.d/iprinit $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/iprinit -install -m 755 init.d/iprdump $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/iprdump -install -m 755 init.d/iprupdate $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/iprupdate +%{__rm} -rf %{buildroot} +%{__make} INSTALL_MOD_PATH=%{buildroot} install + +%{__install} -d %{buildroot}%{_sysconfdir}/rc.d/init.d +%{__install} -m 0755 init.d/iprinit %{buildroot}%{_sysconfdir}/rc.d/init.d/iprinit +%{__install} -m 0755 init.d/iprdump %{buildroot}%{_sysconfdir}/rc.d/init.d/iprdump +%{__install} -m 0755 init.d/iprupdate %{buildroot}%{_sysconfdir}/rc.d/init.d/iprupdate %post /sbin/chkconfig --add iprdump @@ -47,7 +52,7 @@ install -m 755 init.d/iprupdate $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/iprup /sbin/chkconfig --del iprinit %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) @@ -57,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rc.d/init.d/* %changelog +* Fri Nov 16 2007 David Cantrell - 2.2.8-1 +- Upgrade to latest upstream release + * Mon Oct 1 2007 Jeremy Katz - 2.2.6-3 - don't require redhat-lsb (#252343) diff --git a/sources b/sources index d5e1dc1..449ae80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77cb57b85cd9aa331242b7ee37a7aa1b iprutils-2.2.6-src.tgz +6d1c3d2a9e4982f8bf8dba666080a2e9 iprutils-2.2.8-src.tgz From 558c723a3976b266f61b32f9aaf1055632e64253 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 8 Feb 2008 21:26:07 +0000 Subject: [PATCH 03/14] - Rebuild for gcc-4.3 --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index c5ffa01..45baead 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.8 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -62,6 +62,9 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Fri Feb 08 2008 David Cantrell - 2.2.8-2 +- Rebuild for gcc-4.3 + * Fri Nov 16 2007 David Cantrell - 2.2.8-1 - Upgrade to latest upstream release From 1b5cde544d2fab22de4340fc4aa41a1fcef0284e Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Thu, 10 Apr 2008 11:00:47 +0000 Subject: [PATCH 04/14] Rewrited init scripts. Now LSB compliant --- iprutils.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index 45baead..c086da0 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,18 +1,20 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.8 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ Source0: http://osdn.dl.sourceforge.net/sourceforge/iprdd/%{name}-%{version}-src.tgz Patch0: %{name}-cflags.patch -Patch1: %{name}-lsb-init-ectomy.patch - +#Patch1: %{name}-lsb-init-ectomy.patch +Patch2: %{name}-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ppc ppc64 +Requires: /sbin/pidof + BuildRequires: libsysfs-devel BuildRequires: pciutils-devel BuildRequires: ncurses-devel @@ -27,8 +29,8 @@ supported by the ipr SCSI storage device driver. %prep %setup -q -n %{name} %patch0 -p1 -%patch1 -p1 - +#%patch1 -p1 +%patch2 -p1 %build CFLAGS="%{optflags}" %{__make} @@ -62,6 +64,9 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Apr 9 2008 Roman Rakus - 2.2.8-3 +- Rewrited initscripts for satisfying LSB spec + * Fri Feb 08 2008 David Cantrell - 2.2.8-2 - Rebuild for gcc-4.3 From f6788b257ba896e35891c9e6e5d81e2943764c24 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Thu, 10 Apr 2008 11:13:11 +0000 Subject: [PATCH 05/14] Rewrited init scripts. Now LSB compliant --- iprutils-initscripts.patch | 417 +++++++++++++++++++++++++++++++++++++ iprutils.spec | 4 +- 2 files changed, 419 insertions(+), 2 deletions(-) create mode 100644 iprutils-initscripts.patch diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch new file mode 100644 index 0000000..5e98e1e --- /dev/null +++ b/iprutils-initscripts.patch @@ -0,0 +1,417 @@ +diff -up iprutils/init.d/iprha.initscript iprutils/init.d/iprha +diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump +--- iprutils/init.d/iprdump.initscript 2007-06-21 15:44:33.000000000 +0200 ++++ iprutils/init.d/iprdump 2008-04-09 16:46:13.000000000 +0200 +@@ -20,84 +20,74 @@ + # Short-Description: Start the ipr dump daemon + # Description: Start the ipr dump daemon + ### END INIT INFO +- +-IPRDUMP=/sbin/iprdump +-test -x $IPRDUMP || exit 5 +-. /lib/lsb/init-functions ++# ++# chkconfig: - 2345 016 ++# description: Runs the IBM Power RAID adapter dump daemon ++# processname: iprdump ++# pidfile: /var/run/iprdump.pid ++# ++ ++# Source function library ++. /etc/init.d/functions ++ ++RETVAL=0 ++ ++prog=iprdump ++iprdump=/sbin/iprdump ++lockfile=/var/lock/subsys/iprdump ++pidfile=/var/run/iprdump.pid + + start() { + echo -n "Starting ipr dump daemon" + if [ ! -d /sys/class/scsi_generic ] ; then + modprobe sg + fi +- start_daemon $IPRDUMP +- ++ ++ daemon $iprdump + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprdump > $pidfile + return $RETVAL + } + + stop() { +- echo -n "Shutting down ipr dump daemon" +- killproc $IPRDUMP +- +- RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi +- return $RETVAL +-} +- +-restart() { +- $0 stop +- $0 start +- return $RETVAL +-} +- +-reload() { +- echo -n "Reload ipr dump daemon" +- $0 stop && $0 start +- return $RETVAL +-} +- +-status() { +- echo -n "Checking for iprdump daemon: " +- +- pidofproc $IPRDUMP >& /dev/null +- ++ echo -n "Stopping iprdump: " ++ killproc $iprdump -TERM + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg "running" +- else +- log_failure_msg "unused" +- fi +- return $RETVAL ++ rm -f $lockfile $pidfile ++ [ $RETVAL = 0 ] || return $RETVAL + } + + case "$1" in + start) + start ++ RETVAL=$? + ;; + stop) + stop ++ RETVAL=$? + ;; +- restart) +- restart ++ restart|force-reload) ++ stop; start ++ RETVAL=$? + ;; +- reload) ++ try-restart|reload|configtest) ++ RETVAL=3 + reload + ;; ++ condrestart) ++ if [ -f $lockfile ]; then ++ stop ; start ++ RETVAL=$? ++ fi ++ ;; ++ + status) +- status ++ status $iprdump ++ RETVAL=$? + ;; + *) +- echo "Usage: $0 {start|stop|status|restart|reload}" +- exit 1 ++ echo $"Usage: $0 {start|stop|restart|condrestart|status}" ++ RETVAL=3 + ;; + esac +diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate +--- iprutils/init.d/iprupdate.initscript 2007-06-21 15:45:29.000000000 +0200 ++++ iprutils/init.d/iprupdate 2008-04-09 17:18:29.000000000 +0200 +@@ -20,86 +20,74 @@ + # Short-Description: Start the iprupdate utility + # Description: Start the iprupdate utility + ### END INIT INFO +- +-IPRUPDATE=/sbin/iprupdate +-test -x $IPRUPDATE || exit 5 +-. /lib/lsb/init-functions ++# ++# chkconfig: - 2345 016 ++# description: Runs the IBM Power RAID adapter update daemon ++# processname: iprupdate ++# pidfile: /var/run/iprupdate.pid ++# ++ ++# Source function library ++. /etc/init.d/functions ++ ++RETVAL=0 ++ ++prog=iprupdate ++iprupdate=/sbin/iprupdate ++lockfile=/var/lock/subsys/iprupdate ++pidfile=/var/run/iprupdate.pid + + start() { +- echo "Checking ipr microcode levels" +- if [ ! -d /sys/class/scsi_generic ] ; then +- modprobe sg +- fi +- $IPRUPDATE --daemon +- +- RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- echo -n "Completed ipr microcode updates" +- log_success_msg " " +- else +- echo -n "Completed ipr microcode updates" +- log_failure_msg " " +- fi +- return $RETVAL +-} ++ echo -n "Starting iprupdate: " + +-stop() { +- echo -n "Shutting down ipr update daemon" +- killproc $IPRUPDATE +- +- RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " ++ if [ ! -d /sys/class/scsi_generic ]; then ++ modprobe sg + fi +- return $RETVAL +-} +- +-restart() { +- $0 stop +- $0 start +- return $RETVAL +-} + +-reload() { +- $0 stop +- $0 start ++ daemon $iprupdate --daemon ++ RETVAL=$? ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprupdate > $pidfile + return $RETVAL + } + +-status() { +- echo -n "Checking for ipr update daemon: " +- +- pidofproc $IPRUPDATE >& /dev/null +- ++stop() { ++ echo -n "Stopping iprupdate: " ++ killproc $iprupdate -TERM + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg "running" +- else +- log_failure_msg "unused" +- fi +- return $RETVAL ++ rm -f $lockfile $pidfile ++ [ $RETVAL = 0 ] || return $RETVAL + } + + case "$1" in +- start) +- start +- ;; +- stop) +- stop +- ;; +- restart) +- restart +- ;; +- reload) +- reload +- ;; +- status) +- status +- ;; +- *) +- echo "Usage: $0 {start|stop|status|restart|reload}" +- exit 1 +- ;; ++ start) ++ start ++ RETVAL=$? ++ ;; ++ stop) ++ stop ++ RETVAL=$? ++ ;; ++ restart|force-reload) ++ stop ; start ++ RETVAL=$? ++ ;; ++ try-restart|reload|configtest) ++ RETVAL=3 ++ ;; ++ condrestart) ++ if [ -f $lockfile ]; then ++ stop ; start ++ RETVAL=$? ++ fi ++ ;; ++ status) ++ status $iprupdate ++ RETVAL=$? ++ ;; ++ *) ++ echo $"Usage: $0 {start|stop|restart|condrestart|status}" ++ RETVAL=3 ++ ;; + esac ++ +diff -up iprutils/init.d/iprinit.initscript iprutils/init.d/iprinit +--- iprutils/init.d/iprinit.initscript 2007-06-21 15:46:37.000000000 +0200 ++++ iprutils/init.d/iprinit 2008-04-09 17:03:38.000000000 +0200 +@@ -20,84 +20,73 @@ + # Short-Description: Start the ipr init daemon + # Description: Start the ipr initialization daemon + ### END INIT INFO +- +-IPRINIT=/sbin/iprinit +-test -x $IPRINIT || exit 5 +-. /lib/lsb/init-functions ++# ++# chkconfig: - 2345 016 ++# description: Runs the IBM Power RAID adapter initialization daemon ++# processname: iprinit ++# pidfile: /var/run/iprinit.pid ++# ++ ++# Source function library ++. /etc/init.d/functions ++ ++RETVAL=0 ++ ++prog=iprinit ++iprinit=/sbin/iprinit ++lockfile=/var/lock/subsys/iprinit ++pidfile=/var/run/iprinit.pid + + start() { +- echo -n "Starting ipr initialization daemon" ++ echo -n "Starting iprinit: " + if [ ! -d /sys/class/scsi_generic ] ; then + modprobe sg + fi +- start_daemon $IPRINIT --daemon ++ daemon $iprinit --daemon + + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprinit > $pidfile + return $RETVAL + } + + stop() { +- echo -n "Shutting down ipr initialization daemon" +- killproc $IPRINIT +- +- RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi +- return $RETVAL +-} +- +-restart() { +- $0 stop +- $0 start +- return $RETVAL +-} +- +-reload() { +- echo -n "Reload ipr initialization daemon" +- $0 stop && $0 start +- return $RETVAL +-} +- +-status() { +- echo -n "Checking for ipr initialization daemon: " +- +- pidofproc $IPRINIT >& /dev/null +- ++ echo -n "Stopping iprinit: " ++ killproc $iprinit -TERM + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg "running" +- else +- log_failure_msg "unused" +- fi +- return $RETVAL ++ rm -f $lockfile $pidfile ++ [ $RETVAL = 0 ] || return $RETVAL + } + + case "$1" in + start) +- start +- ;; ++ start ++ RETVAL=$? ++ ;; + stop) +- stop +- ;; +- restart) +- restart +- ;; +- reload) +- reload +- ;; ++ stop ++ RETVAL=$? ++ ;; ++ restart|force-reload) ++ stop ; start ++ RETVAL=$? ++ ;; ++ try-restart|reload|configtest) ++ RETVAL=3 ++ ;; ++ condrestart) ++ if [ -f $lockfile ]; then ++ stop ; start ++ RETVAL=$? ++ fi ++ ;; + status) +- status +- ;; ++ status $iprinit ++ RETVAL=$? ++ ;; + *) +- echo "Usage: $0 {start|stop|status|restart|reload}" +- exit 1 +- ;; ++ echo $"Usage: $0 {start|stop|restart|condrestart|status}" ++ RETVAL=3 ++ ;; + esac ++ diff --git a/iprutils.spec b/iprutils.spec index c086da0..d17755a 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.8 -Release: 3%{?dist} +Release: 4%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -64,7 +64,7 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog -* Wed Apr 9 2008 Roman Rakus - 2.2.8-3 +* Wed Apr 9 2008 Roman Rakus - 2.2.8-4 - Rewrited initscripts for satisfying LSB spec * Fri Feb 08 2008 David Cantrell - 2.2.8-2 From 9d7a1d614dd4ee97092607e23f879899eb2ed187 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Wed, 2 Jul 2008 11:47:54 +0000 Subject: [PATCH 06/14] Fixed chkconfig issue - #453165 --- iprutils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index d17755a..b733365 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.8 -Release: 4%{?dist} +Release: 5%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -11,7 +11,7 @@ Patch0: %{name}-cflags.patch #Patch1: %{name}-lsb-init-ectomy.patch Patch2: %{name}-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: ppc ppc64 +#ExclusiveArch: ppc ppc64 Requires: /sbin/pidof @@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Jul 2 2008 Roman Rakus - 2.2.8-5 +- Fixed chkconfig issue - #453165 + * Wed Apr 9 2008 Roman Rakus - 2.2.8-4 - Rewrited initscripts for satisfying LSB spec From 23e794a1bc37c9ca07a8849e740df4da2014f669 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Wed, 2 Jul 2008 11:51:43 +0000 Subject: [PATCH 07/14] Fixed chkconfig issue - #453165 --- iprutils-initscripts.patch | 6 +++--- iprutils.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch index 5e98e1e..156ec62 100644 --- a/iprutils-initscripts.patch +++ b/iprutils-initscripts.patch @@ -11,7 +11,7 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump -test -x $IPRDUMP || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter dump daemon +# processname: iprdump +# pidfile: /var/run/iprdump.pid @@ -141,7 +141,7 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate -test -x $IPRUPDATE || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter update daemon +# processname: iprupdate +# pidfile: /var/run/iprupdate.pid @@ -289,7 +289,7 @@ diff -up iprutils/init.d/iprinit.initscript iprutils/init.d/iprinit -test -x $IPRINIT || exit 5 -. /lib/lsb/init-functions +# -+# chkconfig: - 2345 016 ++# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter initialization daemon +# processname: iprinit +# pidfile: /var/run/iprinit.pid diff --git a/iprutils.spec b/iprutils.spec index b733365..6ba17a8 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -11,7 +11,7 @@ Patch0: %{name}-cflags.patch #Patch1: %{name}-lsb-init-ectomy.patch Patch2: %{name}-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#ExclusiveArch: ppc ppc64 +ExclusiveArch: ppc ppc64 Requires: /sbin/pidof From cd005f503c84aa49db0d7ee70b9798899589c299 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Wed, 2 Jul 2008 12:01:30 +0000 Subject: [PATCH 08/14] Fixed ExclusiveArch tag --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 6ba17a8..088f9dc 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.8 -Release: 5%{?dist} +Release: 6%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Jul 2 2008 Roman Rakus - 2.2.8-6 +- Fixed ExclusiveArch tag + * Wed Jul 2 2008 Roman Rakus - 2.2.8-5 - Fixed chkconfig issue - #453165 From f04cad53cfde51a009d6d4806e8533128c1f1528 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Fri, 21 Nov 2008 13:23:41 +0000 Subject: [PATCH 09/14] New upstream release 2.2.13 --- .cvsignore | 2 +- iprutils-initscripts.patch | 4 ++-- iprutils.spec | 7 +++++-- sources | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 689ca11..c5ef60e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -iprutils-2.2.8-src.tgz +iprutils-2.2.13-src.tgz diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch index 156ec62..e9be06c 100644 --- a/iprutils-initscripts.patch +++ b/iprutils-initscripts.patch @@ -32,7 +32,7 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump if [ ! -d /sys/class/scsi_generic ] ; then modprobe sg fi -- start_daemon $IPRDUMP +- start_daemon $IPRDUMP --daemon - + + daemon $iprdump @@ -162,7 +162,7 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate - if [ ! -d /sys/class/scsi_generic ] ; then - modprobe sg - fi -- $IPRUPDATE --daemon +- start_daemon $IPRUPDATE --daemon - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then diff --git a/iprutils.spec b/iprutils.spec index 088f9dc..e4f95eb 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.2.8 -Release: 6%{?dist} +Version: 2.2.13 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Fri Nov 21 2008 Roman Rakus - 2.2.13-1 +- New upstream version + * Wed Jul 2 2008 Roman Rakus - 2.2.8-6 - Fixed ExclusiveArch tag diff --git a/sources b/sources index 449ae80..ec7d0fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d1c3d2a9e4982f8bf8dba666080a2e9 iprutils-2.2.8-src.tgz +c5ac4eb628ee16fd7816f94c226d6a5b iprutils-2.2.13-src.tgz From c6565ced4ef4d6495fe841db1aecab7433e38370 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Mon, 2 Feb 2009 18:38:05 +0000 Subject: [PATCH 10/14] - Fix iprdump startup - #483340 - iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643) --- iprutils-initscripts.patch | 2 +- iprutils-swab-moved.patch | 12 ++++++++++++ iprutils.spec | 9 ++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 iprutils-swab-moved.patch diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch index e9be06c..afbf955 100644 --- a/iprutils-initscripts.patch +++ b/iprutils-initscripts.patch @@ -35,7 +35,7 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump - start_daemon $IPRDUMP --daemon - + -+ daemon $iprdump ++ daemon $iprdump --daemon RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg " " diff --git a/iprutils-swab-moved.patch b/iprutils-swab-moved.patch new file mode 100644 index 0000000..059c430 --- /dev/null +++ b/iprutils-swab-moved.patch @@ -0,0 +1,12 @@ +diff -up iprutils/iprlib.h.swab-moved iprutils/iprlib.h +--- iprutils/iprlib.h.swab-moved 2009-02-02 13:07:44.118559632 -0500 ++++ iprutils/iprlib.h 2009-02-02 13:07:58.318558756 -0500 +@@ -43,7 +43,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/iprutils.spec b/iprutils.spec index e4f95eb..277747c 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.13 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -10,6 +10,7 @@ Source0: http://osdn.dl.sourceforge.net/sourceforge/iprdd/%{name}-%{version}-src Patch0: %{name}-cflags.patch #Patch1: %{name}-lsb-init-ectomy.patch Patch2: %{name}-initscripts.patch +Patch3: iprutils-swab-moved.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ppc ppc64 @@ -19,6 +20,7 @@ BuildRequires: libsysfs-devel BuildRequires: pciutils-devel BuildRequires: ncurses-devel BuildRequires: libcap-devel +BuildRequires: kernel-devel Obsoletes: ipr-utils @@ -31,6 +33,7 @@ supported by the ipr SCSI storage device driver. %patch0 -p1 #%patch1 -p1 %patch2 -p1 +%patch3 -p1 -b .swab-moved %build CFLAGS="%{optflags}" %{__make} @@ -64,6 +67,10 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Mon Feb 2 2009 Will Woods - 2.2.13-2 +- Fix iprdump startup - #483340 +- iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643) + * Fri Nov 21 2008 Roman Rakus - 2.2.13-1 - New upstream version From 1c54c656bf045c8736ad5d5ebf0573ce5ca645dc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 07:45:49 +0000 Subject: [PATCH 11/14] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 277747c..14ca2f1 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.13 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -67,6 +67,9 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 2 2009 Will Woods - 2.2.13-2 - Fix iprdump startup - #483340 - iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643) From 7adef32bdf6a67b25bc584ed1033eb0c1e8e885d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:12:32 +0000 Subject: [PATCH 12/14] Initialize branch F-11 for iprutils --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 1b52a30cef48e43c66befbd1e434eea06c95f016 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:22:04 +0000 Subject: [PATCH 13/14] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2678099..b13ffc2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := iprutils SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5fe8e11dbe36d2f6557c7dbe819526981f2afdac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:24:01 +0000 Subject: [PATCH 14/14] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b13ffc2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: iprutils -# $Id$ -NAME := iprutils -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11