commit powerpc-utils

2 May 2006

Hello community,

here is the log from the commit of package powerpc-utils
checked in at Wed May 3 00:57:30 CEST 2006.

--------

--- arch/ppc/powerpc-utils/powerpc-utils.changes	2006-03-28 14:40:28.000000000 +0200
+++ STABLE/powerpc-utils/powerpc-utils.changes	2006-04-29 14:26:42.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Apr 29 14:25:10 CEST 2006 - olh@suse.de
+
+- /sys/bus/vio/drivers/ibmvscsis/30000003/bus0/target0/type was
+  removed from sles10, it was always unused.
+  remove it from vscsisadmin and ibmvscsis.conf man page
+
+-------------------------------------------------------------------

New:
----
  powerpc-utils-papr.ibmvscsis.no-type.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ powerpc-utils.spec ++++++
--- /var/tmp/diff_new_pack.16tm2X/_old	2006-05-03 00:56:13.000000000 +0200
+++ /var/tmp/diff_new_pack.16tm2X/_new	2006-05-03 00:56:13.000000000 +0200
@@ -16,7 +16,7 @@
 Obsoletes:      ppc64-utils
 Provides:       ppc64-utils
 Version:        1.0.0
-Release:        2
+Release:        3
 License:        IBM Public License
 URL:            http://powerpc-utils.ozlabs.org/
 Group:          System/Management
@@ -31,6 +31,7 @@
 Patch2:         powerpc-utils.ofpathname.show_of_path.patch
 Patch3:         powerpc-utils.ofpathname.correct-vscsi-scan.patch
 Patch4:         powerpc-utils.bootlist.easy-network-dev.patch
+Patch20:        powerpc-utils-papr.ibmvscsis.no-type.patch
 
 %description
 IBM PPC64 hardware utilities for accessing NVRAM, flashing firmware,
@@ -51,11 +52,12 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-mv powerpc-utils-papr-%{papr_version} papr
+cd powerpc-utils-papr-%{papr_version} 
+%patch20 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?jobs:-j%jobs}
-cd papr
+cd powerpc-utils-papr-%{papr_version} 
 make CFLAGS="$RPM_OPT_FLAGS" %{?jobs:-j%jobs}
 cd ..
 
@@ -67,7 +69,7 @@
 	mandir=%{_mandir}
 mkdir $RPM_BUILD_ROOT/sbin
 mv $RPM_BUILD_ROOT/usr/sbin/{lsprop,nvsetenv} $RPM_BUILD_ROOT/sbin
-cd papr
+cd powerpc-utils-papr-%{papr_version} 
 make install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	rasdir=/usr/sbin \
@@ -85,6 +87,10 @@
 %config %attr (755,root,root) /etc/init.d/ibmvscsis.sh
 
 %changelog -n powerpc-utils
+* Sat Apr 29 2006 - olh@suse.de
+- /sys/bus/vio/drivers/ibmvscsis/30000003/bus0/target0/type was
+  removed from sles10, it was always unused.
+  remove it from vscsisadmin and ibmvscsis.conf man page
 * Tue Mar 28 2006 - olh@suse.de
 - allow bootlist -m normal eth0, no further options required
 * Mon Feb 20 2006 - olh@suse.de

++++++ powerpc-utils-papr.ibmvscsis.no-type.patch ++++++
---
 doc/ibmvscsis.conf.8 |   34 +---------------------------------
 scripts/vscsisadmin  |   21 ---------------------
 2 files changed, 1 insertion(+), 54 deletions(-)

Index: powerpc-utils-papr-1.0.1/doc/ibmvscsis.conf.8
===================================================================
--- powerpc-utils-papr-1.0.1.orig/doc/ibmvscsis.conf.8
+++ powerpc-utils-papr-1.0.1/doc/ibmvscsis.conf.8
@@ -37,7 +37,7 @@ for every vscsis adapter exposed by firm
 The \fBibmvscsis.conf\fR configuration file is built upon
 \fBadapter:bus:target\fR headers which describe SCSI target entries and a
 corresponding entry body built of elements.  These elements denote the
-entry validity state, the entry activity state, the entry type, the
+entry validity state, the entry activity state, the
 device path and an optional loop file path.
 .Pp
 .Ss ENTRY HEADER
@@ -99,26 +99,6 @@ The first is that all targets are activa
 "\fBinactive\fR" element indicates otherwise.  Please reference the
 \fBACTIVITY STATE\fR sub section for further details on the activity state
 default and the method to override it.
-.Pp
-The second default assumption is that the target device \fBtype\fR is a
-\fBblock\fR device.  Excluding the "\fBtype\fR" element from the entry is
-tantamount to declaring it a block device as the following example indicates:
-.Bd -literal
-	\fBibmvscsis:30000005:bus0:target0
-		device_path="/dev/sdb1"
-		#defaults to type="b"\fR
-.Ed
-.Pp
-It is strongly recommended that \fBtype="b"\fR element be included in the
-entry body anyway, for clarity as the following example shows:
-.Bd -literal
-	\fBibmvscsis:30000005:bus0:target0
-		device_path="/dev/sdb1"
-		type="b"\fR
-.Ed
-.Pp
-In the future when other device types are supported the type element will
-indicate which type to set for each target.
 .Ss ACTIVITY STATES
 An entry can be either \fBactive\fR or \fBinactive\fR.  The activity state
 dictates whether the \fBvscsisadmin\fR utility activates the target once it
@@ -131,7 +111,6 @@ element must be included in the entry bo
 .Bd -literal
 	\fBibmvscsis:30000005:bus0:target0
 		device_path="/dev/sdb1"
-		type="b"
 		inactive\fR
 .Ed
 .Pp
@@ -154,7 +133,6 @@ is a large flat file created especially 
 	\fBibmvscsis:30000005:bus0:target1
 		loop_file="var/vscsis/vdisk/"
 		device_path="/dev/loop1"
-		type="b"\fR
 .Ed
 .Pp
 The \fBloop_file\fR element may be placed anywhere in the entry though it is
@@ -209,44 +187,34 @@ configuration follows:
 .Bd -literal
 	\fBibmvscsis:30000003:bus0:target0
 		device_path="/dev/sdd1"
-		type="b"
 	ibmvscsis:30000004:bus0:target0
 		device_path="/dev/sdd2"
-		#you can exclude the 'type="b"' as well
 	ibmvscsis:30000005:bus0:target0
 		device_path="/dev/sdd3"
-		type="b"
 	ibmvscsis:30000006:bus0:target0
 		device_path="/dev/sdd5"
-		type="b"
 	ibmvscsis:30000006:bus0:target1
 		device_path="/dev/sdd6"
-		type="b"
 	ibmvscsis:30000007:bus0:target0
 		none
 	ibmvscsis:30000008:bus0:target0
 		device_path="/dev/sdd7"
-		type="b"
 		inactive
 	ibmvscsis:30000008:bus1:target0
 		loop_file="/var/vscsi/vdisk1"
 		device_path="/dev/loop0"
-		type="b"
 	ibmvscsis:30000009:bus0:target0
 		none
 	ibmvscsis:3000000a:bus0:target0
 		loop_file="/var/vscsi/vdisk2"
 		device_path="/dev/loop1"
-		type="b"
 		inactive
 	ibmvscsis:3000000b:bus0:target0
 		loop_file="/var/vscsi/vdisk3"
 		device_path="/dev/loop2"
-		type="b"
 	ibmvscsis:3000000c:bus0:target0
 		loop_file="/var/vscsi/vdisk4"
 		device_path="/dev/loop3"
-		type="b"
 .Ed
 .Sh SEE ALSO
 .Xr ibmvscsis.sh 8 ,
Index: powerpc-utils-papr-1.0.1/scripts/vscsisadmin
===================================================================
--- powerpc-utils-papr-1.0.1.orig/scripts/vscsisadmin
+++ powerpc-utils-papr-1.0.1/scripts/vscsisadmin
@@ -614,7 +614,6 @@ sub start_all( $ $ $ ) {
         my $loop_file = "";
         my $device_path = "";
         my $valid = 0;
-        my $type = "";
         my $active = 1; #entries active by default
 
         #return value
@@ -642,9 +641,6 @@ sub start_all( $ $ $ ) {
                 if (! -e "$target_path/device") {
                     errorprint("$app_name: target$target/device attribute doesn't exist.\n");
                     next;
-                } elsif (! -e "$target_path/type") {
-                    errorprint("$app_name: target$target/type attribute doesn't exist.\n");
-                    next;
                 } elsif (! -e "$target_path/active") {
                     errorprint("$app_name: target$target/active attribute doesn't exist.\n");
                     next;
@@ -690,19 +686,6 @@ sub start_all( $ $ $ ) {
             $val = undef;
         }
 
-        # defaults to block device if there is not a type element specified
-        # in the future the type could be read from the /dev/ entry
-        # pointed to by the "device" element, unless of course a flat file
-        # .iso is set up as a loop device.
-        ($val) = ($entry =~ /\n\s*type=\"(.*)\"\s*/i);
-        if (defined $val) {
-            $type = $1;
-            $val = undef;
-        } else {
-            verboseprint("$middle didn't find 'type' element, defaulting to 'block'.\n");
-            $type = "b";
-        }
-
         # active by default
         ($val) = ($entry =~ /\n\s*inactive\s*/i);
         if (defined $val) {
@@ -737,10 +720,6 @@ sub start_all( $ $ $ ) {
         `echo $device_path > $target_path/device 2>/dev/null`;
         statusprint("$middle wrote \"$device_path\" to target$target/device.\n");
 
-        #write type to target/type in sysfs
-        `echo $type > $target_path/type 2>/dev/null`;
-        statusprint("$middle wrote \"$type\" to target$target/type.\n");
-
         if ($active) {
             statusprint "$end Activating $adapter:bus$bus:target$target\.\n";
             `echo 1 > $target_path/active 2>/dev/null`;

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)