sg_vpd: pwr_d_s (spl3r3); scripts directory gets Makefile.am

git-svn-id: svn://localhost/trunk@495 6180dd3e-e324-4e3e-922d-17de1ae2f315

Author: doug-gilbert

ChangeLog

@@ -2,9 +2,10 @@ Each utility has its own version number, date of last change and
 some description at the top of its ".c" file. All utilities in the main
 directory have their own "man" pages. There is also a sg3_utils man page.
 
-Changelog for sg3_utils-1.36 [20130508] [svn: r494]
-  - sg_vpd: Protocol-specific port information VPD page for
-    SAS SSP, persistent connection (spl3r2)
+Changelog for sg3_utils-1.36 [20130513] [svn: r495]
+  - sg_vpd: Protocol-specific port information VPD page
+    for SAS SSP, persistent connection (spl3r2), power
+    disable (spl3r3)
   - sg_xcopy: handle more descriptor types; handle zero
     maximum segment length; allow list IDs to be disabled;
     improve skip/seek handling; allow xcopy on destination

Makefile.am

@@ -2,7 +2,8 @@
 SUBDIRS = include \
 	  lib \
 	  src \
-	  doc
+	  doc \
+	  scripts
 
 EXTRA_DIST=autogen.sh COVERAGE CREDITS
 

Makefile.in

@@ -247,7 +247,8 @@ top_srcdir = @top_srcdir@
 SUBDIRS = include \
 	  lib \
 	  src \
-	  doc
+	  doc \
+	  scripts
 
 EXTRA_DIST = autogen.sh COVERAGE CREDITS
 all: config.h

aclocal.m4

@@ -1338,7 +1338,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -1702,7 +1709,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -2526,17 +2534,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -2653,7 +2650,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -3269,10 +3266,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3311,7 +3304,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4063,7 +4056,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4362,7 +4355,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -6251,9 +6244,6 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6415,7 +6405,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler

build_debian.sh

@@ -8,8 +8,8 @@ chmod +x debian/rules
 
 # in some environments the '-rfakeroot' can cause a failure (e.g. when
 # building as root). If so, remove that argument from the following:
-echo "dpkg-buildpackage -b -rfakeroot"
-dpkg-buildpackage -b -rfakeroot
+echo "dpkg-buildpackage -b -rfakeroot -us -uc"
+dpkg-buildpackage -b -rfakeroot -us -uc
 
 # If the above succeeds then the ".deb" binary package is placed in the
 # parent directory.

configure

@@ -4531,7 +4531,8 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -4932,10 +4933,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4974,7 +4971,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6072,7 +6069,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -7897,7 +7901,7 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -10067,17 +10071,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -10194,7 +10187,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -11573,7 +11566,7 @@ _ACEOF
 fi
 
 
-ac_config_files="$ac_config_files Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile scripts/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12605,6 +12598,7 @@ do
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.ac

@@ -81,4 +81,4 @@ AC_ARG_ENABLE([scsistrings],
 		  [Disable full SCSI sense strings])],
   [], [AC_DEFINE_UNQUOTED(SG_SCSI_STRINGS, 1, [full SCSI sense strings], )])
 
-AC_OUTPUT(Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile)
+AC_OUTPUT(Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile scripts/Makefile)

debian/rules

@@ -49,7 +49,6 @@ install: build
 	$(MAKE) -e install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr
 
 	dh_install --autodest --sourcedir=debian/tmp
-	cp scripts/scsi* debian/sg3-utils/usr/bin
 
 	dh_installman
 

doc/scsi_logging_level.8

@@ -1,4 +1,4 @@
-.TH SCSI_LOGGING_LEVEL "8" "December 2011" "sg3_utils\-1.33" SG3_UTILS
+.TH SCSI_LOGGING_LEVEL "8" "May 2013" "sg3_utils\-1.36" SG3_UTILS
 .SH NAME
 scsi_logging_level \- access Linux SCSI logging level information
 .SH SYNOPSIS
@@ -12,7 +12,7 @@ scsi_logging_level \- access Linux SCSI logging level information
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
-This Bourne shell script accesses the Linux SCSI subsystem logging
+This bash shell script accesses the Linux SCSI subsystem logging
 level. The current values can be shown (e.g. with \fI\-\-get\fR)
 or changed (e.g. with \fI\-\-set\fR). Superuser permissions will
 typically be required to set the logging level.

doc/scsi_mandat.8

@@ -1,4 +1,4 @@
-.TH SCSI_MANDAT "8" "December 2011" "sg3_utils\-1.33" SG3_UTILS
+.TH SCSI_MANDAT "8" "May 2013" "sg3_utils\-1.36" SG3_UTILS
 .SH NAME
 scsi_mandat \- check SCSI device support for mandatory commands
 .SH SYNOPSIS
@@ -8,7 +8,7 @@ scsi_mandat \- check SCSI device support for mandatory commands
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
-This Bourne shell script calls several SCSI commands on the given
+This bash shell script calls several SCSI commands on the given
 \fIDEVICE\fR. These SCSI commands are considered mandatory (although
 that varies a little depending on which standard/draft the \fIDEVICE\fR
 complies with). The results of each test and a pass/fail count are
@@ -36,7 +36,7 @@ expected.
 .SH AUTHORS
 Written by D. Gilbert
 .SH COPYRIGHT
-Copyright \(co 2011 Douglas Gilbert
+Copyright \(co 2011\-2013 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

doc/scsi_readcap.8

@@ -1,4 +1,4 @@
-.TH SCSI_READCAP "8" "October 2009" "sg3_utils\-1.28" SG3_UTILS
+.TH SCSI_READCAP "8" "May 2013" "sg3_utils\-1.36" SG3_UTILS
 .SH NAME
 scsi_readcap \- do SCSI READ CAPACITY command on disks
 .SH SYNOPSIS
@@ -8,7 +8,7 @@ scsi_readcap \- do SCSI READ CAPACITY command on disks
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
-This Bourne shell script calls the sg_readcap utility on each given
+This bash shell script calls the sg_readcap utility on each given
 \fIDEVICE\fR. This will send a SCSI READ CAPACITY command to each
 \fIDEVICE\fR.
 .PP
@@ -43,7 +43,7 @@ the sg3_utils(8) man page.
 .SH AUTHORS
 Written by D. Gilbert
 .SH COPYRIGHT
-Copyright \(co 2009 Douglas Gilbert
+Copyright \(co 2009\-2013 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

doc/scsi_ready.8

@@ -1,4 +1,4 @@
-.TH SCSI_READY "8" "October 2009" "sg3_utils\-1.28" SG3_UTILS
+.TH SCSI_READY "8" "May 2013" "sg3_utils\-1.36" SG3_UTILS
 .SH NAME
 scsi_ready \- do SCSI TEST UNIT READY on devices
 .SH SYNOPSIS
@@ -8,7 +8,7 @@ scsi_ready \- do SCSI TEST UNIT READY on devices
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
-This Bourne shell script calls the sg_turs utility on each given
+This bash shell script calls the sg_turs utility on each given
 \fIDEVICE\fR. This will send a SCSI TEST UNIT READY command to each
 \fIDEVICE\fR. Disks, tape drives and DVD/BD players amongst others
 may respond to this SCSI command.
@@ -32,7 +32,7 @@ the sg3_utils(8) man page.
 .SH AUTHORS
 Written by D. Gilbert
 .SH COPYRIGHT
-Copyright \(co 2009 Douglas Gilbert
+Copyright \(co 2009\-2013 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

doc/scsi_satl.8

@@ -1,4 +1,4 @@
-.TH SCSI_SATL "8" "December 2011" "sg3_utils\-1.33" SG3_UTILS
+.TH SCSI_SATL "8" "May 2013" "sg3_utils\-1.36" SG3_UTILS
 .SH NAME
 scsi_satl \- check SCSI to ATA Translation (SAT) device support
 .SH SYNOPSIS
@@ -8,7 +8,7 @@ scsi_satl \- check SCSI to ATA Translation (SAT) device support
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
-This Bourne shell script calls several SCSI commands on the given
+This bash shell script calls several SCSI commands on the given
 \fIDEVICE\fR that is assumed to be an ATA device behind a SCSI
 to ATA Translation (SAT) layer (SATL). The results of each test
 and a pass/fail count are output.
@@ -35,7 +35,7 @@ expected.
 .SH AUTHORS
 Written by D. Gilbert
 .SH COPYRIGHT
-Copyright \(co 2011 Douglas Gilbert
+Copyright \(co 2011\-2013 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.