Skip to content

Commit 849ff1c

Browse files
doug-gilbertdoug-gilbert
committed
sg_vpd: pwr_d_s (spl3r3); scripts directory gets Makefile.am
git-svn-id: svn://localhost/trunk@495 6180dd3e-e324-4e3e-922d-17de1ae2f315
1 parent 7246aed commit 849ff1c

28 files changed

+621
-131
lines changed

‎ChangeLog

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ Each utility has its own version number, date of last change and
22
some description at the top of its ".c" file. All utilities in the main
33
directory have their own "man" pages. There is also a sg3_utils man page.
44

5-
Changelog for sg3_utils-1.36 [20130508] [svn: r494]
6-
- sg_vpd: Protocol-specific port information VPD page for
7-
SAS SSP, persistent connection (spl3r2)
5+
Changelog for sg3_utils-1.36 [20130513] [svn: r495]
6+
- sg_vpd: Protocol-specific port information VPD page
7+
for SAS SSP, persistent connection (spl3r2), power
8+
disable (spl3r3)
89
- sg_xcopy: handle more descriptor types; handle zero
910
maximum segment length; allow list IDs to be disabled;
1011
improve skip/seek handling; allow xcopy on destination

‎Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
SUBDIRS = include \
33
lib \
44
src \
5-
doc
5+
doc \
6+
scripts
67

78
EXTRA_DIST=autogen.sh COVERAGE CREDITS
89

‎Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@ top_srcdir = @top_srcdir@
247247
SUBDIRS = include \
248248
lib \
249249
src \
250-
doc
250+
doc \
251+
scripts
251252

252253
EXTRA_DIST = autogen.sh COVERAGE CREDITS
253254
all: config.h

‎aclocal.m4

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
13381338
LD="${LD-ld} -m elf_i386_fbsd"
13391339
;;
13401340
x86_64-*linux*)
1341-
LD="${LD-ld} -m elf_i386"
1341+
case `/usr/bin/file conftest.o` in
1342+
*x86-64*)
1343+
LD="${LD-ld} -m elf32_x86_64"
1344+
;;
1345+
*)
1346+
LD="${LD-ld} -m elf_i386"
1347+
;;
1348+
esac
13421349
;;
13431350
ppc64-*linux*|powerpc64-*linux*)
13441351
LD="${LD-ld} -m elf32ppclinux"
@@ -1702,7 +1709,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
17021709
;;
17031710
*)
17041711
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
1705-
if test -n "$lt_cv_sys_max_cmd_len"; then
1712+
if test -n "$lt_cv_sys_max_cmd_len" && \
1713+
test undefined != "$lt_cv_sys_max_cmd_len"; then
17061714
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
17071715
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
17081716
else
@@ -2526,17 +2534,6 @@ freebsd* | dragonfly*)
25262534
esac
25272535
;;
25282536
2529-
gnu*)
2530-
version_type=linux # correct to gnu/linux during the next big refactor
2531-
need_lib_prefix=no
2532-
need_version=no
2533-
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
2534-
soname_spec='${libname}${release}${shared_ext}$major'
2535-
shlibpath_var=LD_LIBRARY_PATH
2536-
shlibpath_overrides_runpath=no
2537-
hardcode_into_libs=yes
2538-
;;
2539-
25402537
haiku*)
25412538
version_type=linux # correct to gnu/linux during the next big refactor
25422539
need_lib_prefix=no
@@ -2653,7 +2650,7 @@ linux*oldld* | linux*aout* | linux*coff*)
26532650
;;
26542651
26552652
# This must be glibc/ELF.
2656-
linux* | k*bsd*-gnu | kopensolaris*-gnu)
2653+
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
26572654
version_type=linux # correct to gnu/linux during the next big refactor
26582655
need_lib_prefix=no
26592656
need_version=no
@@ -3269,10 +3266,6 @@ freebsd* | dragonfly*)
32693266
fi
32703267
;;
32713268
3272-
gnu*)
3273-
lt_cv_deplibs_check_method=pass_all
3274-
;;
3275-
32763269
haiku*)
32773270
lt_cv_deplibs_check_method=pass_all
32783271
;;
@@ -3311,7 +3304,7 @@ irix5* | irix6* | nonstopux*)
33113304
;;
33123305
33133306
# This must be glibc/ELF.
3314-
linux* | k*bsd*-gnu | kopensolaris*-gnu)
3307+
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
33153308
lt_cv_deplibs_check_method=pass_all
33163309
;;
33173310
@@ -4063,7 +4056,7 @@ m4_if([$1], [CXX], [
40634056
;;
40644057
esac
40654058
;;
4066-
linux* | k*bsd*-gnu | kopensolaris*-gnu)
4059+
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
40674060
case $cc_basename in
40684061
KCC*)
40694062
# KAI C++ Compiler
@@ -4362,7 +4355,7 @@ m4_if([$1], [CXX], [
43624355
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
43634356
;;
43644357
4365-
linux* | k*bsd*-gnu | kopensolaris*-gnu)
4358+
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
43664359
case $cc_basename in
43674360
# old Intel for x86_64 which still supported -KPIC.
43684361
ecc*)
@@ -6251,9 +6244,6 @@ if test "$_lt_caught_CXX_error" != yes; then
62516244
_LT_TAGVAR(ld_shlibs, $1)=yes
62526245
;;
62536246
6254-
gnu*)
6255-
;;
6256-
62576247
haiku*)
62586248
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
62596249
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6415,7 +6405,7 @@ if test "$_lt_caught_CXX_error" != yes; then
64156405
_LT_TAGVAR(inherit_rpath, $1)=yes
64166406
;;
64176407
6418-
linux* | k*bsd*-gnu | kopensolaris*-gnu)
6408+
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
64196409
case $cc_basename in
64206410
KCC*)
64216411
# Kuck and Associates, Inc. (KAI) C++ Compiler

‎build_debian.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ chmod +x debian/rules
88

99
# in some environments the '-rfakeroot' can cause a failure (e.g. when
1010
# building as root). If so, remove that argument from the following:
11-
echo "dpkg-buildpackage -b -rfakeroot"
12-
dpkg-buildpackage -b -rfakeroot
11+
echo "dpkg-buildpackage -b -rfakeroot -us -uc"
12+
dpkg-buildpackage -b -rfakeroot -us -uc
1313

1414
# If the above succeeds then the ".deb" binary package is placed in the
1515
# parent directory.

‎configure

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4531,7 +4531,8 @@ else
45314531
;;
45324532
*)
45334533
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
4534-
if test -n "$lt_cv_sys_max_cmd_len"; then
4534+
if test -n "$lt_cv_sys_max_cmd_len" && \
4535+
test undefined != "$lt_cv_sys_max_cmd_len"; then
45354536
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
45364537
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
45374538
else
@@ -4932,10 +4933,6 @@ freebsd* | dragonfly*)
49324933
fi
49334934
;;
49344935

4935-
gnu*)
4936-
lt_cv_deplibs_check_method=pass_all
4937-
;;
4938-
49394936
haiku*)
49404937
lt_cv_deplibs_check_method=pass_all
49414938
;;
@@ -4974,7 +4971,7 @@ irix5* | irix6* | nonstopux*)
49744971
;;
49754972

49764973
# This must be glibc/ELF.
4977-
linux* | k*bsd*-gnu | kopensolaris*-gnu)
4974+
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
49784975
lt_cv_deplibs_check_method=pass_all
49794976
;;
49804977

@@ -6072,7 +6069,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
60726069
LD="${LD-ld} -m elf_i386_fbsd"
60736070
;;
60746071
x86_64-*linux*)
6075-
LD="${LD-ld} -m elf_i386"
6072+
case `/usr/bin/file conftest.o` in
6073+
*x86-64*)
6074+
LD="${LD-ld} -m elf32_x86_64"
6075+
;;
6076+
*)
6077+
LD="${LD-ld} -m elf_i386"
6078+
;;
6079+
esac
60766080
;;
60776081
ppc64-*linux*|powerpc64-*linux*)
60786082
LD="${LD-ld} -m elf32ppclinux"
@@ -7897,7 +7901,7 @@ lt_prog_compiler_static=
78977901
lt_prog_compiler_static='-non_shared'
78987902
;;
78997903

7900-
linux* | k*bsd*-gnu | kopensolaris*-gnu)
7904+
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
79017905
case $cc_basename in
79027906
# old Intel for x86_64 which still supported -KPIC.
79037907
ecc*)
@@ -10067,17 +10071,6 @@ freebsd* | dragonfly*)
1006710071
esac
1006810072
;;
1006910073

10070-
gnu*)
10071-
version_type=linux # correct to gnu/linux during the next big refactor
10072-
need_lib_prefix=no
10073-
need_version=no
10074-
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
10075-
soname_spec='${libname}${release}${shared_ext}$major'
10076-
shlibpath_var=LD_LIBRARY_PATH
10077-
shlibpath_overrides_runpath=no
10078-
hardcode_into_libs=yes
10079-
;;
10080-
1008110074
haiku*)
1008210075
version_type=linux # correct to gnu/linux during the next big refactor
1008310076
need_lib_prefix=no
@@ -10194,7 +10187,7 @@ linux*oldld* | linux*aout* | linux*coff*)
1019410187
;;
1019510188

1019610189
# This must be glibc/ELF.
10197-
linux* | k*bsd*-gnu | kopensolaris*-gnu)
10190+
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
1019810191
version_type=linux # correct to gnu/linux during the next big refactor
1019910192
need_lib_prefix=no
1020010193
need_version=no
@@ -11573,7 +11566,7 @@ _ACEOF
1157311566
fi
1157411567

1157511568

11576-
ac_config_files="$ac_config_files Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile"
11569+
ac_config_files="$ac_config_files Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile scripts/Makefile"
1157711570

1157811571
cat >confcache <<\_ACEOF
1157911572
# This file is a shell script that caches the results of configure
@@ -12605,6 +12598,7 @@ do
1260512598
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
1260612599
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
1260712600
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
12601+
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
1260812602
1260912603
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
1261012604
esac

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ AC_ARG_ENABLE([scsistrings],
8181
[Disable full SCSI sense strings])],
8282
[], [AC_DEFINE_UNQUOTED(SG_SCSI_STRINGS, 1, [full SCSI sense strings], )])
8383

84-
AC_OUTPUT(Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile)
84+
AC_OUTPUT(Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile scripts/Makefile)

‎debian/rules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ install: build
4949
$(MAKE) -e install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr
5050

5151
dh_install --autodest --sourcedir=debian/tmp
52-
cp scripts/scsi* debian/sg3-utils/usr/bin
5352

5453
dh_installman
5554

‎doc/scsi_logging_level.8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH SCSI_LOGGING_LEVEL "8" "December 2011" "sg3_utils\-1.33" SG3_UTILS
1+
.TH SCSI_LOGGING_LEVEL "8" "May 2013" "sg3_utils\-1.36" SG3_UTILS
22
.SH NAME
33
scsi_logging_level \- access Linux SCSI logging level information
44
.SH SYNOPSIS
@@ -12,7 +12,7 @@ scsi_logging_level \- access Linux SCSI logging level information
1212
.SH DESCRIPTION
1313
.\" Add any additional description here
1414
.PP
15-
This Bourne shell script accesses the Linux SCSI subsystem logging
15+
This bash shell script accesses the Linux SCSI subsystem logging
1616
level. The current values can be shown (e.g. with \fI\-\-get\fR)
1717
or changed (e.g. with \fI\-\-set\fR). Superuser permissions will
1818
typically be required to set the logging level.

‎doc/scsi_mandat.8

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH SCSI_MANDAT "8" "December 2011" "sg3_utils\-1.33" SG3_UTILS
1+
.TH SCSI_MANDAT "8" "May 2013" "sg3_utils\-1.36" SG3_UTILS
22
.SH NAME
33
scsi_mandat \- check SCSI device support for mandatory commands
44
.SH SYNOPSIS
@@ -8,7 +8,7 @@ scsi_mandat \- check SCSI device support for mandatory commands
88
.SH DESCRIPTION
99
.\" Add any additional description here
1010
.PP
11-
This Bourne shell script calls several SCSI commands on the given
11+
This bash shell script calls several SCSI commands on the given
1212
\fIDEVICE\fR. These SCSI commands are considered mandatory (although
1313
that varies a little depending on which standard/draft the \fIDEVICE\fR
1414
complies with). The results of each test and a pass/fail count are
@@ -36,7 +36,7 @@ expected.
3636
.SH AUTHORS
3737
Written by D. Gilbert
3838
.SH COPYRIGHT
39-
Copyright \(co 2011 Douglas Gilbert
39+
Copyright \(co 2011\-2013 Douglas Gilbert
4040
.br
4141
This software is distributed under a FreeBSD license. There is NO
4242
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

0 commit comments

Comments
 (0)