Skip to content

Commit

Permalink
sync to upstream sdparm svn rev 341
Browse files Browse the repository at this point in the history
See ChangeLog file for changes [2021207].
Add include and lib directories (from sg3_utils) to ease building.
Git tools can't handle svn externals.
  • Loading branch information
doug-gilbert committed Dec 8, 2020
1 parent ff46f2b commit 73547fc
Show file tree
Hide file tree
Showing 65 changed files with 26,849 additions and 75 deletions.
3 changes: 0 additions & 3 deletions BSD_LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
PROPS-END

Copyright (c) 1999-2018, Douglas Gilbert
All rights reserved.
Expand All @@ -23,5 +22,3 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



9 changes: 5 additions & 4 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ The version number is hardcoded into sdparm.c (in a C string);
the rpm spec file: sdparm.spec ; the debian/changelog file;
and the configure.ac file (in the AC_INIT item).

ChangeLog for sdparm-1.12 [20200713] [svn: r338]
ChangeLog for sdparm-1.12 [20201207] [svn: r341]
- block device char vpd page: add zoned strings
- vpd: add Format presets and Concurrent positioning
ranges pages
- vpd: standard inquiry: add hot_pluggable field
- sg_lib: allows access to cache mpage's WCE for nvme
- point svn:externals to rev 855 of sg3_utils
- point svn:externals to rev 869 of sg3_utils

ChangeLog for sdparm-1.11 [20200303] [svn: r334]
- Allow ZBC mode pages to use existing SBC mpages
Expand Down Expand Up @@ -381,5 +384,3 @@ ChangeLog for sdparm-0.91 [20050506]

ChangeLog for sdparm-0.90 [20050418]
- initial version


2 changes: 0 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -785,5 +785,3 @@ distclean-local:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


2 changes: 0 additions & 2 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1275,5 +1275,3 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR



2 changes: 0 additions & 2 deletions ar-lib
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -268,5 +268,3 @@ elif test -n "$list"; then
fi
$AR -NOLOGO -LIST "$archive" || exit $?
fi


2 changes: 0 additions & 2 deletions compile
Original file line number Diff line number Diff line change
Expand Up @@ -345,5 +345,3 @@ exit $ret
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:


2 changes: 0 additions & 2 deletions config.guess
Original file line number Diff line number Diff line change
Expand Up @@ -1478,5 +1478,3 @@ exit 1
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:


2 changes: 0 additions & 2 deletions config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,3 @@

/* Version number of package */
#undef VERSION


2 changes: 0 additions & 2 deletions config.sub
Original file line number Diff line number Diff line change
Expand Up @@ -1799,5 +1799,3 @@ exit
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:


2 changes: 0 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -6407,5 +6407,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,3 @@ AC_ARG_ENABLE([fast-lebe],

# AC_PROG_LIBTOOL
AC_OUTPUT(Makefile src/Makefile doc/Makefile scripts/Makefile)


4 changes: 1 addition & 3 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sdparm (1.12-0.1) unstable; urgency=low

* see ChangeLog

-- Douglas Gilbert <[email protected]> Mon, 13 Jul 2020 21:00:00 -0400
-- Douglas Gilbert <[email protected]> Mon, 07 Dec 2020 21:00:00 -0500

sdparm (1.11-0.1) unstable; urgency=low

Expand Down Expand Up @@ -168,5 +168,3 @@ sdparm (0.93-1) unstable; urgency=low

-- Tomas Fasth <[email protected]> Wed, 8 Jun 2005 23:48:13 +0000



2 changes: 0 additions & 2 deletions debian/compat
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
10


2 changes: 0 additions & 2 deletions depcomp
Original file line number Diff line number Diff line change
Expand Up @@ -789,5 +789,3 @@ exit 0
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:


2 changes: 0 additions & 2 deletions doc/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -495,5 +495,3 @@ uninstall-man: uninstall-man8
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


4 changes: 1 addition & 3 deletions doc/sdparm.8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH SDPARM "8" "July 2020" "sdparm\-1.12" SDPARM
.TH SDPARM "8" "December 2020" "sdparm\-1.12" SDPARM
.SH NAME
sdparm \- access SCSI modes pages; read VPD pages; send simple SCSI commands.
.SH SYNOPSIS
Expand Down Expand Up @@ -1003,5 +1003,3 @@ http://sg.danny.cz/sg/sdparm.html .
.B hdparm(hdparm),
.B sg_modes, sg_wr_mode, sginfo, sg_inq, sg_vpd(all in sg3_utils),
.B smartmontools(smartmontools.sourceforge.net), mt, eject(eject),


62 changes: 62 additions & 0 deletions include/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@

scsiincludedir = $(includedir)/scsi

scsiinclude_HEADERS = \
sg_lib.h \
sg_lib_data.h \
sg_cmds.h \
sg_cmds_basic.h \
sg_cmds_extra.h \
sg_cmds_mmc.h \
sg_pr2serr.h \
sg_unaligned.h \
sg_pt.h \
sg_pt_nvme.h

if OS_LINUX
scsiinclude_HEADERS += \
sg_linux_inc.h \
sg_io_linux.h \
sg_pt_linux.h

noinst_HEADERS = \
sg_pt_win32.h
endif

if OS_WIN32_MINGW
scsiinclude_HEADERS += sg_pt_win32.h

noinst_HEADERS = \
sg_linux_inc.h \
sg_io_linux.h
endif

if OS_WIN32_CYGWIN
scsiinclude_HEADERS += sg_pt_win32.h

noinst_HEADERS = \
sg_linux_inc.h \
sg_io_linux.h
endif

if OS_FREEBSD
noinst_HEADERS = \
sg_linux_inc.h \
sg_io_linux.h \
sg_pt_win32.h
endif

if OS_SOLARIS
noinst_HEADERS = \
sg_linux_inc.h \
sg_io_linux.h \
sg_pt_win32.h
endif

if OS_OSF
noinst_HEADERS = \
sg_linux_inc.h \
sg_io_linux.h \
sg_pt_win32.h
endif

Loading

0 comments on commit 73547fc

Please sign in to comment.