pool/sg3_utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sg3_utils?expand=0&rev=11

Browse Source
This commit is contained in:
OBS User unknown 2009-07-23 15:21:39 +00:00 committed by Git OBS Bridge
parent fc77f67578
commit 30720f2ad0
4 changed files with 11 additions and 1011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

895
sg3_lib_v1.diff
View File

@ -1,895 +0,0 @@
Index: sg3_utils-1.27/lib/Makefile.am
===================================================================
--- sg3_utils-1.27.orig/lib/Makefile.am
+++ sg3_utils-1.27/lib/Makefile.am
@@ -1,18 +1,18 @@
if OS_LINUX
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
sg_lib.c \
sg_lib_data.c \
sg_cmds_basic.c \
sg_cmds_extra.c \
sg_cmds_mmc.c \
sg_pt_linux.c \
sg_io_linux.c
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
sg_pt_freebsd.c \
sg_pt_osf1.c \
sg_pt_solaris.c \
sg_pt_win32.c \
@@ -22,17 +22,17 @@ endif
if OS_WIN32_MINGW
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
sg_lib.c \
sg_lib_data.c \
sg_cmds_basic.c \
sg_cmds_extra.c \
sg_cmds_mmc.c \
sg_pt_win32.c
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
sg_pt_linux.c \
sg_io_linux.c \
sg_pt_freebsd.c \
sg_pt_osf1.c \
@@ -43,17 +43,17 @@ endif
if OS_WIN32_CYGWIN
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
sg_lib.c \
sg_lib_data.c \
sg_cmds_basic.c \
sg_cmds_extra.c \
sg_cmds_mmc.c \
sg_pt_win32.c
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
sg_pt_linux.c \
sg_io_linux.c \
sg_pt_freebsd.c \
sg_pt_osf1.c \
@@ -64,17 +64,17 @@ endif
if OS_FREEBSD
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
sg_lib.c \
sg_lib_data.c \
sg_cmds_basic.c \
sg_cmds_extra.c \
sg_cmds_mmc.c \
sg_pt_freebsd.c
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
sg_pt_linux.c \
sg_io_linux.c \
sg_linux_inc.h \
sg_pt_osf1.c \
@@ -86,17 +86,17 @@ endif
if OS_SOLARIS
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
sg_lib.c \
sg_lib_data.c \
sg_cmds_basic.c \
sg_cmds_extra.c \
sg_cmds_mmc.c \
sg_pt_solaris.c
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
sg_pt_linux.c \
sg_io_linux.c \
sg_linux_inc.h \
sg_pt_freebsd.c \
@@ -108,17 +108,17 @@ endif
if OS_OSF
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
sg_lib.c \
sg_lib_data.c \
sg_cmds_basic.c \
sg_cmds_extra.c \
sg_cmds_mmc.c \
sg_pt_osf1.c
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
sg_pt_linux.c \
sg_io_linux.c \
sg_pt_freebsd.c \
sg_pt_solaris.c \
@@ -130,12 +130,12 @@ endif
AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
# AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
-lib_LTLIBRARIES = libsgutils2.la
+lib_LTLIBRARIES = libsgutils.la
-libsgutils2_la_LDFLAGS = -version-info 2:0:0
+libsgutils_la_LDFLAGS = -version-info 1:0:0
-libsgutils2_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
-libsgutils2_la_DEPENDENCIES = @GETOPT_O_FILES@
+libsgutils_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
+libsgutils_la_DEPENDENCIES = @GETOPT_O_FILES@
Index: sg3_utils-1.27/lib/Makefile.in
===================================================================
--- sg3_utils-1.27.orig/lib/Makefile.in
+++ sg3_utils-1.27/lib/Makefile.in
@@ -49,53 +49,53 @@ am__vpath_adj = case $$p in \
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-am__libsgutils2_la_SOURCES_DIST = sg_lib.c sg_lib_data.c \
+am__libsgutils_la_SOURCES_DIST = sg_lib.c sg_lib_data.c \
sg_cmds_basic.c sg_cmds_extra.c sg_cmds_mmc.c sg_pt_freebsd.c \
sg_pt_linux.c sg_io_linux.c sg_pt_osf1.c sg_pt_solaris.c \
sg_pt_win32.c
-@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@am_libsgutils2_la_OBJECTS = sg_lib.lo \
+@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@am_libsgutils_la_OBJECTS = sg_lib.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@ sg_lib_data.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@ sg_cmds_basic.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@ sg_cmds_extra.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@ sg_cmds_mmc.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@ sg_pt_win32.lo
-@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@am_libsgutils2_la_OBJECTS = sg_lib.lo \
+@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@am_libsgutils_la_OBJECTS = sg_lib.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@ sg_lib_data.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@ sg_cmds_basic.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@ sg_cmds_extra.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@ sg_cmds_mmc.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@ sg_pt_win32.lo
-@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@am_libsgutils2_la_OBJECTS = sg_lib.lo \
+@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@am_libsgutils_la_OBJECTS = sg_lib.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@ sg_lib_data.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@ sg_cmds_basic.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@ sg_cmds_extra.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@ sg_cmds_mmc.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@ sg_pt_solaris.lo
-@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@am_libsgutils2_la_OBJECTS = \
+@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@am_libsgutils_la_OBJECTS = \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@ sg_lib.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@ sg_lib_data.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@ sg_cmds_basic.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@ sg_cmds_extra.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@ sg_cmds_mmc.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@ sg_pt_osf1.lo
-@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@am_libsgutils2_la_OBJECTS = \
+@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@am_libsgutils_la_OBJECTS = \
@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@ sg_lib.lo sg_lib_data.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@ sg_cmds_basic.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@ sg_cmds_extra.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@ sg_cmds_mmc.lo sg_pt_linux.lo \
@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@ sg_io_linux.lo
-@OS_FREEBSD_TRUE@am_libsgutils2_la_OBJECTS = sg_lib.lo sg_lib_data.lo \
+@OS_FREEBSD_TRUE@am_libsgutils_la_OBJECTS = sg_lib.lo sg_lib_data.lo \
@OS_FREEBSD_TRUE@ sg_cmds_basic.lo sg_cmds_extra.lo \
@OS_FREEBSD_TRUE@ sg_cmds_mmc.lo sg_pt_freebsd.lo
-am__EXTRA_libsgutils2_la_SOURCES_DIST = sg_pt_linux.c sg_io_linux.c \
+am__EXTRA_libsgutils_la_SOURCES_DIST = sg_pt_linux.c sg_io_linux.c \
sg_linux_inc.h sg_pt_osf1.c sg_pt_solaris.c sg_pt_win32.c \
getopt_long.c sg_pt_freebsd.c
-libsgutils2_la_OBJECTS = $(am_libsgutils2_la_OBJECTS)
-libsgutils2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+libsgutils_la_OBJECTS = $(am_libsgutils_la_OBJECTS)
+libsgutils_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libsgutils2_la_LDFLAGS) $(LDFLAGS) -o $@
+ $(libsgutils_la_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -106,11 +106,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(libsgutils2_la_SOURCES) $(EXTRA_libsgutils2_la_SOURCES)
-DIST_SOURCES = $(am__libsgutils2_la_SOURCES_DIST) \
- $(am__EXTRA_libsgutils2_la_SOURCES_DIST)
+SOURCES = $(libsgutils_la_SOURCES) $(EXTRA_libsgutils_la_SOURCES)
+DIST_SOURCES = $(am__libsgutils_la_SOURCES_DIST) \
+ $(am__EXTRA_libsgutils_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -222,99 +222,99 @@ srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@OS_FREEBSD_TRUE@libsgutils2_la_SOURCES = \
+@OS_FREEBSD_TRUE@libsgutils_la_SOURCES = \
@OS_FREEBSD_TRUE@ sg_lib.c \
@OS_FREEBSD_TRUE@ sg_lib_data.c \
@OS_FREEBSD_TRUE@ sg_cmds_basic.c \
@OS_FREEBSD_TRUE@ sg_cmds_extra.c \
@OS_FREEBSD_TRUE@ sg_cmds_mmc.c \
@OS_FREEBSD_TRUE@ sg_pt_freebsd.c
-@OS_LINUX_TRUE@libsgutils2_la_SOURCES = \
+@OS_LINUX_TRUE@libsgutils_la_SOURCES = \
@OS_LINUX_TRUE@ sg_lib.c \
@OS_LINUX_TRUE@ sg_lib_data.c \
@OS_LINUX_TRUE@ sg_cmds_basic.c \
@OS_LINUX_TRUE@ sg_cmds_extra.c \
@OS_LINUX_TRUE@ sg_cmds_mmc.c \
@OS_LINUX_TRUE@ sg_pt_linux.c \
@OS_LINUX_TRUE@ sg_io_linux.c
-@OS_OSF_TRUE@libsgutils2_la_SOURCES = \
+@OS_OSF_TRUE@libsgutils_la_SOURCES = \
@OS_OSF_TRUE@ sg_lib.c \
@OS_OSF_TRUE@ sg_lib_data.c \
@OS_OSF_TRUE@ sg_cmds_basic.c \
@OS_OSF_TRUE@ sg_cmds_extra.c \
@OS_OSF_TRUE@ sg_cmds_mmc.c \
@OS_OSF_TRUE@ sg_pt_osf1.c
-@OS_SOLARIS_TRUE@libsgutils2_la_SOURCES = \
+@OS_SOLARIS_TRUE@libsgutils_la_SOURCES = \
@OS_SOLARIS_TRUE@ sg_lib.c \
@OS_SOLARIS_TRUE@ sg_lib_data.c \
@OS_SOLARIS_TRUE@ sg_cmds_basic.c \
@OS_SOLARIS_TRUE@ sg_cmds_extra.c \
@OS_SOLARIS_TRUE@ sg_cmds_mmc.c \
@OS_SOLARIS_TRUE@ sg_pt_solaris.c
-@OS_WIN32_CYGWIN_TRUE@libsgutils2_la_SOURCES = \
+@OS_WIN32_CYGWIN_TRUE@libsgutils_la_SOURCES = \
@OS_WIN32_CYGWIN_TRUE@ sg_lib.c \
@OS_WIN32_CYGWIN_TRUE@ sg_lib_data.c \
@OS_WIN32_CYGWIN_TRUE@ sg_cmds_basic.c \
@OS_WIN32_CYGWIN_TRUE@ sg_cmds_extra.c \
@OS_WIN32_CYGWIN_TRUE@ sg_cmds_mmc.c \
@OS_WIN32_CYGWIN_TRUE@ sg_pt_win32.c
-@OS_WIN32_MINGW_TRUE@libsgutils2_la_SOURCES = \
+@OS_WIN32_MINGW_TRUE@libsgutils_la_SOURCES = \
@OS_WIN32_MINGW_TRUE@ sg_lib.c \
@OS_WIN32_MINGW_TRUE@ sg_lib_data.c \
@OS_WIN32_MINGW_TRUE@ sg_cmds_basic.c \
@OS_WIN32_MINGW_TRUE@ sg_cmds_extra.c \
@OS_WIN32_MINGW_TRUE@ sg_cmds_mmc.c \
@OS_WIN32_MINGW_TRUE@ sg_pt_win32.c
-@OS_FREEBSD_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_FREEBSD_TRUE@EXTRA_libsgutils_la_SOURCES = \
@OS_FREEBSD_TRUE@ sg_pt_linux.c \
@OS_FREEBSD_TRUE@ sg_io_linux.c \
@OS_FREEBSD_TRUE@ sg_linux_inc.h \
@OS_FREEBSD_TRUE@ sg_pt_osf1.c \
@OS_FREEBSD_TRUE@ sg_pt_solaris.c \
@OS_FREEBSD_TRUE@ sg_pt_win32.c \
@OS_FREEBSD_TRUE@ getopt_long.c
-@OS_LINUX_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_LINUX_TRUE@EXTRA_libsgutils_la_SOURCES = \
@OS_LINUX_TRUE@ sg_pt_freebsd.c \
@OS_LINUX_TRUE@ sg_pt_osf1.c \
@OS_LINUX_TRUE@ sg_pt_solaris.c \
@OS_LINUX_TRUE@ sg_pt_win32.c \
@OS_LINUX_TRUE@ getopt_long.c
-@OS_OSF_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_OSF_TRUE@EXTRA_libsgutils_la_SOURCES = \
@OS_OSF_TRUE@ sg_pt_linux.c \
@OS_OSF_TRUE@ sg_io_linux.c \
@OS_OSF_TRUE@ sg_pt_freebsd.c \
@OS_OSF_TRUE@ sg_pt_solaris.c \
@OS_OSF_TRUE@ sg_pt_win32.c \
@OS_OSF_TRUE@ getopt_long.c
-@OS_SOLARIS_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_SOLARIS_TRUE@EXTRA_libsgutils_la_SOURCES = \
@OS_SOLARIS_TRUE@ sg_pt_linux.c \
@OS_SOLARIS_TRUE@ sg_io_linux.c \
@OS_SOLARIS_TRUE@ sg_linux_inc.h \
@OS_SOLARIS_TRUE@ sg_pt_freebsd.c \
@OS_SOLARIS_TRUE@ sg_pt_osf1.c \
@OS_SOLARIS_TRUE@ sg_pt_win32.c \
@OS_SOLARIS_TRUE@ getopt_long.c
-@OS_WIN32_CYGWIN_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_WIN32_CYGWIN_TRUE@EXTRA_libsgutils_la_SOURCES = \
@OS_WIN32_CYGWIN_TRUE@ sg_pt_linux.c \
@OS_WIN32_CYGWIN_TRUE@ sg_io_linux.c \
@OS_WIN32_CYGWIN_TRUE@ sg_pt_freebsd.c \
@OS_WIN32_CYGWIN_TRUE@ sg_pt_osf1.c \
@OS_WIN32_CYGWIN_TRUE@ sg_pt_solaris.c \
@OS_WIN32_CYGWIN_TRUE@ getopt_long.c
-@OS_WIN32_MINGW_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_WIN32_MINGW_TRUE@EXTRA_libsgutils_la_SOURCES = \
@OS_WIN32_MINGW_TRUE@ sg_pt_linux.c \
@OS_WIN32_MINGW_TRUE@ sg_io_linux.c \
@OS_WIN32_MINGW_TRUE@ sg_pt_freebsd.c \
@OS_WIN32_MINGW_TRUE@ sg_pt_osf1.c \
@@ -322,12 +322,12 @@ top_srcdir = @top_srcdir@
@OS_WIN32_MINGW_TRUE@ getopt_long.c
AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
# AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
-lib_LTLIBRARIES = libsgutils2.la
-libsgutils2_la_LDFLAGS = -version-info 2:0:0
-libsgutils2_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
-libsgutils2_la_DEPENDENCIES = @GETOPT_O_FILES@
+lib_LTLIBRARIES = libsgutils.la
+libsgutils_la_LDFLAGS = -version-info 1:0:0
+libsgutils_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
+libsgutils_la_DEPENDENCIES = @GETOPT_O_FILES@
all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -386,10 +386,10 @@ clean-libLTLIBRARIES:
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libsgutils2.la: $(libsgutils2_la_OBJECTS) $(libsgutils2_la_DEPENDENCIES)
- $(libsgutils2_la_LINK) -rpath $(libdir) $(libsgutils2_la_OBJECTS) $(libsgutils2_la_LIBADD) $(LIBS)
+libsgutils.la: $(libsgutils_la_OBJECTS) $(libsgutils_la_DEPENDENCIES)
+ $(libsgutils_la_LINK) -rpath $(libdir) $(libsgutils_la_OBJECTS) $(libsgutils_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Index: sg3_utils-1.27/src/Makefile.am
===================================================================
--- sg3_utils-1.27.orig/src/Makefile.am
+++ sg3_utils-1.27/src/Makefile.am
@@ -104,141 +104,141 @@ endif
AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
# AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
sg_dd_SOURCES = sg_dd.c
-sg_dd_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_dd_LDADD = ../lib/libsgutils.la @os_libs@
sg_emc_trespass_SOURCES = sg_emc_trespass.c
-sg_emc_trespass_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_emc_trespass_LDADD = ../lib/libsgutils.la @os_libs@
sg_format_SOURCES = sg_format.c
-sg_format_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_format_LDADD = ../lib/libsgutils.la @os_libs@
sg_get_config_SOURCES = sg_get_config.c
-sg_get_config_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_get_config_LDADD = ../lib/libsgutils.la @os_libs@
sg_ident_SOURCES = sg_ident.c
-sg_ident_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_ident_LDADD = ../lib/libsgutils.la @os_libs@
sginfo_SOURCES = sginfo.c
-sginfo_LDADD = ../lib/libsgutils2.la @os_libs@
+sginfo_LDADD = ../lib/libsgutils.la @os_libs@
sg_inq_SOURCES = sg_inq.c sg_inq_data.c
-sg_inq_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_inq_LDADD = ../lib/libsgutils.la @os_libs@
sg_logs_SOURCES = sg_logs.c
-sg_logs_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_logs_LDADD = ../lib/libsgutils.la @os_libs@
sg_luns_SOURCES = sg_luns.c
-sg_luns_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_luns_LDADD = ../lib/libsgutils.la @os_libs@
sg_map26_SOURCES = sg_map26.c
sg_map26_LDADD = @os_libs@
sg_map_SOURCES = sg_map.c
-sg_map_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_map_LDADD = ../lib/libsgutils.la @os_libs@
sgm_dd_SOURCES = sgm_dd.c
-sgm_dd_LDADD = ../lib/libsgutils2.la @os_libs@
+sgm_dd_LDADD = ../lib/libsgutils.la @os_libs@
sg_modes_SOURCES = sg_modes.c
-sg_modes_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_modes_LDADD = ../lib/libsgutils.la @os_libs@
sg_opcodes_SOURCES = sg_opcodes.c
-sg_opcodes_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_opcodes_LDADD = ../lib/libsgutils.la @os_libs@
sgp_dd_SOURCES = sgp_dd.c
-sgp_dd_LDADD = ../lib/libsgutils2.la @os_libs@ -lpthread
+sgp_dd_LDADD = ../lib/libsgutils.la @os_libs@ -lpthread
sg_persist_SOURCES = sg_persist.c
-sg_persist_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_persist_LDADD = ../lib/libsgutils.la @os_libs@
sg_prevent_SOURCES = sg_prevent.c
-sg_prevent_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_prevent_LDADD = ../lib/libsgutils.la @os_libs@
sg_raw_SOURCES = sg_raw.c
-sg_raw_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_raw_LDADD = ../lib/libsgutils.la @os_libs@
sg_rbuf_SOURCES = sg_rbuf.c
-sg_rbuf_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rbuf_LDADD = ../lib/libsgutils.la @os_libs@
sg_rdac_SOURCES = sg_rdac.c
-sg_rdac_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rdac_LDADD = ../lib/libsgutils.la @os_libs@
sg_read_SOURCES = sg_read.c
-sg_read_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_LDADD = ../lib/libsgutils.la @os_libs@
sg_readcap_SOURCES = sg_readcap.c
-sg_readcap_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_readcap_LDADD = ../lib/libsgutils.la @os_libs@
sg_read_buffer_SOURCES = sg_read_buffer.c
-sg_read_buffer_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_buffer_LDADD = ../lib/libsgutils.la @os_libs@
sg_read_long_SOURCES = sg_read_long.c
-sg_read_long_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_long_LDADD = ../lib/libsgutils.la @os_libs@
sg_reassign_SOURCES = sg_reassign.c
-sg_reassign_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_reassign_LDADD = ../lib/libsgutils.la @os_libs@
sg_requests_SOURCES = sg_requests.c
-sg_requests_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_requests_LDADD = ../lib/libsgutils.la @os_libs@
sg_reset_SOURCES = sg_reset.c
sg_reset_LDADD = @os_libs@
sg_rmsn_SOURCES = sg_rmsn.c
-sg_rmsn_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rmsn_LDADD = ../lib/libsgutils.la @os_libs@
sg_rtpg_SOURCES = sg_rtpg.c
-sg_rtpg_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rtpg_LDADD = ../lib/libsgutils.la @os_libs@
sg_safte_SOURCES = sg_safte.c
-sg_safte_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_safte_LDADD = ../lib/libsgutils.la @os_libs@
sg_sat_identify_SOURCES = sg_sat_identify.c
-sg_sat_identify_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_identify_LDADD = ../lib/libsgutils.la @os_libs@
sg_sat_phy_event_SOURCES = sg_sat_phy_event.c
-sg_sat_phy_event_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_phy_event_LDADD = ../lib/libsgutils.la @os_libs@
sg_sat_set_features_SOURCES = sg_sat_set_features.c
-sg_sat_set_features_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_set_features_LDADD = ../lib/libsgutils.la @os_libs@
sg_scan_SOURCES = sg_scan.c
-sg_scan_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_scan_LDADD = ../lib/libsgutils.la @os_libs@
sg_senddiag_SOURCES = sg_senddiag.c
-sg_senddiag_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_senddiag_LDADD = ../lib/libsgutils.la @os_libs@
sg_ses_SOURCES = sg_ses.c
-sg_ses_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_ses_LDADD = ../lib/libsgutils.la @os_libs@
sg_start_SOURCES = sg_start.c
-sg_start_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_start_LDADD = ../lib/libsgutils.la @os_libs@
sg_stpg_SOURCES = sg_stpg.c
-sg_stpg_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_stpg_LDADD = ../lib/libsgutils.la @os_libs@
sg_sync_SOURCES = sg_sync.c
-sg_sync_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sync_LDADD = ../lib/libsgutils.la @os_libs@
sg_test_rwbuf_SOURCES = sg_test_rwbuf.c
-sg_test_rwbuf_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_test_rwbuf_LDADD = ../lib/libsgutils.la @os_libs@
sg_turs_SOURCES = sg_turs.c
-sg_turs_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_turs_LDADD = ../lib/libsgutils.la @os_libs@
sg_verify_SOURCES = sg_verify.c
-sg_verify_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_verify_LDADD = ../lib/libsgutils.la @os_libs@
sg_vpd_SOURCES = sg_vpd.c sg_vpd_vendor.c
-sg_vpd_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_vpd_LDADD = ../lib/libsgutils.la @os_libs@
sg_write_buffer_SOURCES = sg_write_buffer.c
-sg_write_buffer_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_buffer_LDADD = ../lib/libsgutils.la @os_libs@
sg_write_long_SOURCES = sg_write_long.c
-sg_write_long_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_long_LDADD = ../lib/libsgutils.la @os_libs@
sg_wr_mode_SOURCES = sg_wr_mode.c
-sg_wr_mode_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_wr_mode_LDADD = ../lib/libsgutils.la @os_libs@
Index: sg3_utils-1.27/src/Makefile.in
===================================================================
--- sg3_utils-1.27.orig/src/Makefile.in
+++ sg3_utils-1.27/src/Makefile.in
@@ -248,144 +248,144 @@ am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_sg_dd_OBJECTS = sg_dd.$(OBJEXT)
sg_dd_OBJECTS = $(am_sg_dd_OBJECTS)
-sg_dd_DEPENDENCIES = ../lib/libsgutils2.la
+sg_dd_DEPENDENCIES = ../lib/libsgutils.la
am_sg_emc_trespass_OBJECTS = sg_emc_trespass.$(OBJEXT)
sg_emc_trespass_OBJECTS = $(am_sg_emc_trespass_OBJECTS)
-sg_emc_trespass_DEPENDENCIES = ../lib/libsgutils2.la
+sg_emc_trespass_DEPENDENCIES = ../lib/libsgutils.la
am_sg_format_OBJECTS = sg_format.$(OBJEXT)
sg_format_OBJECTS = $(am_sg_format_OBJECTS)
-sg_format_DEPENDENCIES = ../lib/libsgutils2.la
+sg_format_DEPENDENCIES = ../lib/libsgutils.la
am_sg_get_config_OBJECTS = sg_get_config.$(OBJEXT)
sg_get_config_OBJECTS = $(am_sg_get_config_OBJECTS)
-sg_get_config_DEPENDENCIES = ../lib/libsgutils2.la
+sg_get_config_DEPENDENCIES = ../lib/libsgutils.la
am_sg_ident_OBJECTS = sg_ident.$(OBJEXT)
sg_ident_OBJECTS = $(am_sg_ident_OBJECTS)
-sg_ident_DEPENDENCIES = ../lib/libsgutils2.la
+sg_ident_DEPENDENCIES = ../lib/libsgutils.la
am_sg_inq_OBJECTS = sg_inq.$(OBJEXT) sg_inq_data.$(OBJEXT)
sg_inq_OBJECTS = $(am_sg_inq_OBJECTS)
-sg_inq_DEPENDENCIES = ../lib/libsgutils2.la
+sg_inq_DEPENDENCIES = ../lib/libsgutils.la
am_sg_logs_OBJECTS = sg_logs.$(OBJEXT)
sg_logs_OBJECTS = $(am_sg_logs_OBJECTS)
-sg_logs_DEPENDENCIES = ../lib/libsgutils2.la
+sg_logs_DEPENDENCIES = ../lib/libsgutils.la
am_sg_luns_OBJECTS = sg_luns.$(OBJEXT)
sg_luns_OBJECTS = $(am_sg_luns_OBJECTS)
-sg_luns_DEPENDENCIES = ../lib/libsgutils2.la
+sg_luns_DEPENDENCIES = ../lib/libsgutils.la
am_sg_map_OBJECTS = sg_map.$(OBJEXT)
sg_map_OBJECTS = $(am_sg_map_OBJECTS)
-sg_map_DEPENDENCIES = ../lib/libsgutils2.la
+sg_map_DEPENDENCIES = ../lib/libsgutils.la
am_sg_map26_OBJECTS = sg_map26.$(OBJEXT)
sg_map26_OBJECTS = $(am_sg_map26_OBJECTS)
sg_map26_DEPENDENCIES =
am_sg_modes_OBJECTS = sg_modes.$(OBJEXT)
sg_modes_OBJECTS = $(am_sg_modes_OBJECTS)
-sg_modes_DEPENDENCIES = ../lib/libsgutils2.la
+sg_modes_DEPENDENCIES = ../lib/libsgutils.la
am_sg_opcodes_OBJECTS = sg_opcodes.$(OBJEXT)
sg_opcodes_OBJECTS = $(am_sg_opcodes_OBJECTS)
-sg_opcodes_DEPENDENCIES = ../lib/libsgutils2.la
+sg_opcodes_DEPENDENCIES = ../lib/libsgutils.la
am_sg_persist_OBJECTS = sg_persist.$(OBJEXT)
sg_persist_OBJECTS = $(am_sg_persist_OBJECTS)
-sg_persist_DEPENDENCIES = ../lib/libsgutils2.la
+sg_persist_DEPENDENCIES = ../lib/libsgutils.la
am_sg_prevent_OBJECTS = sg_prevent.$(OBJEXT)
sg_prevent_OBJECTS = $(am_sg_prevent_OBJECTS)
-sg_prevent_DEPENDENCIES = ../lib/libsgutils2.la
+sg_prevent_DEPENDENCIES = ../lib/libsgutils.la
am_sg_raw_OBJECTS = sg_raw.$(OBJEXT)
sg_raw_OBJECTS = $(am_sg_raw_OBJECTS)
-sg_raw_DEPENDENCIES = ../lib/libsgutils2.la
+sg_raw_DEPENDENCIES = ../lib/libsgutils.la
am_sg_rbuf_OBJECTS = sg_rbuf.$(OBJEXT)
sg_rbuf_OBJECTS = $(am_sg_rbuf_OBJECTS)
-sg_rbuf_DEPENDENCIES = ../lib/libsgutils2.la
+sg_rbuf_DEPENDENCIES = ../lib/libsgutils.la
am_sg_rdac_OBJECTS = sg_rdac.$(OBJEXT)
sg_rdac_OBJECTS = $(am_sg_rdac_OBJECTS)
-sg_rdac_DEPENDENCIES = ../lib/libsgutils2.la
+sg_rdac_DEPENDENCIES = ../lib/libsgutils.la
am_sg_read_OBJECTS = sg_read.$(OBJEXT)
sg_read_OBJECTS = $(am_sg_read_OBJECTS)
-sg_read_DEPENDENCIES = ../lib/libsgutils2.la
+sg_read_DEPENDENCIES = ../lib/libsgutils.la
am_sg_read_buffer_OBJECTS = sg_read_buffer.$(OBJEXT)
sg_read_buffer_OBJECTS = $(am_sg_read_buffer_OBJECTS)
-sg_read_buffer_DEPENDENCIES = ../lib/libsgutils2.la
+sg_read_buffer_DEPENDENCIES = ../lib/libsgutils.la
am_sg_read_long_OBJECTS = sg_read_long.$(OBJEXT)
sg_read_long_OBJECTS = $(am_sg_read_long_OBJECTS)
-sg_read_long_DEPENDENCIES = ../lib/libsgutils2.la
+sg_read_long_DEPENDENCIES = ../lib/libsgutils.la
am_sg_readcap_OBJECTS = sg_readcap.$(OBJEXT)
sg_readcap_OBJECTS = $(am_sg_readcap_OBJECTS)
-sg_readcap_DEPENDENCIES = ../lib/libsgutils2.la
+sg_readcap_DEPENDENCIES = ../lib/libsgutils.la
am_sg_reassign_OBJECTS = sg_reassign.$(OBJEXT)
sg_reassign_OBJECTS = $(am_sg_reassign_OBJECTS)
-sg_reassign_DEPENDENCIES = ../lib/libsgutils2.la
+sg_reassign_DEPENDENCIES = ../lib/libsgutils.la
am_sg_requests_OBJECTS = sg_requests.$(OBJEXT)
sg_requests_OBJECTS = $(am_sg_requests_OBJECTS)
-sg_requests_DEPENDENCIES = ../lib/libsgutils2.la
+sg_requests_DEPENDENCIES = ../lib/libsgutils.la
am_sg_reset_OBJECTS = sg_reset.$(OBJEXT)
sg_reset_OBJECTS = $(am_sg_reset_OBJECTS)
sg_reset_DEPENDENCIES =
am_sg_rmsn_OBJECTS = sg_rmsn.$(OBJEXT)
sg_rmsn_OBJECTS = $(am_sg_rmsn_OBJECTS)
-sg_rmsn_DEPENDENCIES = ../lib/libsgutils2.la
+sg_rmsn_DEPENDENCIES = ../lib/libsgutils.la
am_sg_rtpg_OBJECTS = sg_rtpg.$(OBJEXT)
sg_rtpg_OBJECTS = $(am_sg_rtpg_OBJECTS)
-sg_rtpg_DEPENDENCIES = ../lib/libsgutils2.la
+sg_rtpg_DEPENDENCIES = ../lib/libsgutils.la
am_sg_safte_OBJECTS = sg_safte.$(OBJEXT)
sg_safte_OBJECTS = $(am_sg_safte_OBJECTS)
-sg_safte_DEPENDENCIES = ../lib/libsgutils2.la
+sg_safte_DEPENDENCIES = ../lib/libsgutils.la
am_sg_sat_identify_OBJECTS = sg_sat_identify.$(OBJEXT)
sg_sat_identify_OBJECTS = $(am_sg_sat_identify_OBJECTS)
-sg_sat_identify_DEPENDENCIES = ../lib/libsgutils2.la
+sg_sat_identify_DEPENDENCIES = ../lib/libsgutils.la
am_sg_sat_phy_event_OBJECTS = sg_sat_phy_event.$(OBJEXT)
sg_sat_phy_event_OBJECTS = $(am_sg_sat_phy_event_OBJECTS)
-sg_sat_phy_event_DEPENDENCIES = ../lib/libsgutils2.la
+sg_sat_phy_event_DEPENDENCIES = ../lib/libsgutils.la
am_sg_sat_set_features_OBJECTS = sg_sat_set_features.$(OBJEXT)
sg_sat_set_features_OBJECTS = $(am_sg_sat_set_features_OBJECTS)
-sg_sat_set_features_DEPENDENCIES = ../lib/libsgutils2.la
+sg_sat_set_features_DEPENDENCIES = ../lib/libsgutils.la
am_sg_scan_OBJECTS = sg_scan.$(OBJEXT)
sg_scan_OBJECTS = $(am_sg_scan_OBJECTS)
-sg_scan_DEPENDENCIES = ../lib/libsgutils2.la
+sg_scan_DEPENDENCIES = ../lib/libsgutils.la
am_sg_senddiag_OBJECTS = sg_senddiag.$(OBJEXT)
sg_senddiag_OBJECTS = $(am_sg_senddiag_OBJECTS)
-sg_senddiag_DEPENDENCIES = ../lib/libsgutils2.la
+sg_senddiag_DEPENDENCIES = ../lib/libsgutils.la
am_sg_ses_OBJECTS = sg_ses.$(OBJEXT)
sg_ses_OBJECTS = $(am_sg_ses_OBJECTS)
-sg_ses_DEPENDENCIES = ../lib/libsgutils2.la
+sg_ses_DEPENDENCIES = ../lib/libsgutils.la
am_sg_start_OBJECTS = sg_start.$(OBJEXT)
sg_start_OBJECTS = $(am_sg_start_OBJECTS)
-sg_start_DEPENDENCIES = ../lib/libsgutils2.la
+sg_start_DEPENDENCIES = ../lib/libsgutils.la
am_sg_stpg_OBJECTS = sg_stpg.$(OBJEXT)
sg_stpg_OBJECTS = $(am_sg_stpg_OBJECTS)
-sg_stpg_DEPENDENCIES = ../lib/libsgutils2.la
+sg_stpg_DEPENDENCIES = ../lib/libsgutils.la
am_sg_sync_OBJECTS = sg_sync.$(OBJEXT)
sg_sync_OBJECTS = $(am_sg_sync_OBJECTS)
-sg_sync_DEPENDENCIES = ../lib/libsgutils2.la
+sg_sync_DEPENDENCIES = ../lib/libsgutils.la
am_sg_test_rwbuf_OBJECTS = sg_test_rwbuf.$(OBJEXT)
sg_test_rwbuf_OBJECTS = $(am_sg_test_rwbuf_OBJECTS)
-sg_test_rwbuf_DEPENDENCIES = ../lib/libsgutils2.la
+sg_test_rwbuf_DEPENDENCIES = ../lib/libsgutils.la
am_sg_turs_OBJECTS = sg_turs.$(OBJEXT)
sg_turs_OBJECTS = $(am_sg_turs_OBJECTS)
-sg_turs_DEPENDENCIES = ../lib/libsgutils2.la
+sg_turs_DEPENDENCIES = ../lib/libsgutils.la
am_sg_verify_OBJECTS = sg_verify.$(OBJEXT)
sg_verify_OBJECTS = $(am_sg_verify_OBJECTS)
-sg_verify_DEPENDENCIES = ../lib/libsgutils2.la
+sg_verify_DEPENDENCIES = ../lib/libsgutils.la
am_sg_vpd_OBJECTS = sg_vpd.$(OBJEXT) sg_vpd_vendor.$(OBJEXT)
sg_vpd_OBJECTS = $(am_sg_vpd_OBJECTS)
-sg_vpd_DEPENDENCIES = ../lib/libsgutils2.la
+sg_vpd_DEPENDENCIES = ../lib/libsgutils.la
am_sg_wr_mode_OBJECTS = sg_wr_mode.$(OBJEXT)
sg_wr_mode_OBJECTS = $(am_sg_wr_mode_OBJECTS)
-sg_wr_mode_DEPENDENCIES = ../lib/libsgutils2.la
+sg_wr_mode_DEPENDENCIES = ../lib/libsgutils.la
am_sg_write_buffer_OBJECTS = sg_write_buffer.$(OBJEXT)
sg_write_buffer_OBJECTS = $(am_sg_write_buffer_OBJECTS)
-sg_write_buffer_DEPENDENCIES = ../lib/libsgutils2.la
+sg_write_buffer_DEPENDENCIES = ../lib/libsgutils.la
am_sg_write_long_OBJECTS = sg_write_long.$(OBJEXT)
sg_write_long_OBJECTS = $(am_sg_write_long_OBJECTS)
-sg_write_long_DEPENDENCIES = ../lib/libsgutils2.la
+sg_write_long_DEPENDENCIES = ../lib/libsgutils.la
am_sginfo_OBJECTS = sginfo.$(OBJEXT)
sginfo_OBJECTS = $(am_sginfo_OBJECTS)
-sginfo_DEPENDENCIES = ../lib/libsgutils2.la
+sginfo_DEPENDENCIES = ../lib/libsgutils.la
am_sgm_dd_OBJECTS = sgm_dd.$(OBJEXT)
sgm_dd_OBJECTS = $(am_sgm_dd_OBJECTS)
-sgm_dd_DEPENDENCIES = ../lib/libsgutils2.la
+sgm_dd_DEPENDENCIES = ../lib/libsgutils.la
am_sgp_dd_OBJECTS = sgp_dd.$(OBJEXT)
sgp_dd_OBJECTS = $(am_sgp_dd_OBJECTS)
-sgp_dd_DEPENDENCIES = ../lib/libsgutils2.la
+sgp_dd_DEPENDENCIES = ../lib/libsgutils.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -550,99 +550,99 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
# AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
sg_dd_SOURCES = sg_dd.c
-sg_dd_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_dd_LDADD = ../lib/libsgutils.la @os_libs@
sg_emc_trespass_SOURCES = sg_emc_trespass.c
-sg_emc_trespass_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_emc_trespass_LDADD = ../lib/libsgutils.la @os_libs@
sg_format_SOURCES = sg_format.c
-sg_format_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_format_LDADD = ../lib/libsgutils.la @os_libs@
sg_get_config_SOURCES = sg_get_config.c
-sg_get_config_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_get_config_LDADD = ../lib/libsgutils.la @os_libs@
sg_ident_SOURCES = sg_ident.c
-sg_ident_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_ident_LDADD = ../lib/libsgutils.la @os_libs@
sginfo_SOURCES = sginfo.c
-sginfo_LDADD = ../lib/libsgutils2.la @os_libs@
+sginfo_LDADD = ../lib/libsgutils.la @os_libs@
sg_inq_SOURCES = sg_inq.c sg_inq_data.c
-sg_inq_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_inq_LDADD = ../lib/libsgutils.la @os_libs@
sg_logs_SOURCES = sg_logs.c
-sg_logs_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_logs_LDADD = ../lib/libsgutils.la @os_libs@
sg_luns_SOURCES = sg_luns.c
-sg_luns_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_luns_LDADD = ../lib/libsgutils.la @os_libs@
sg_map26_SOURCES = sg_map26.c
sg_map26_LDADD = @os_libs@
sg_map_SOURCES = sg_map.c
-sg_map_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_map_LDADD = ../lib/libsgutils.la @os_libs@
sgm_dd_SOURCES = sgm_dd.c
-sgm_dd_LDADD = ../lib/libsgutils2.la @os_libs@
+sgm_dd_LDADD = ../lib/libsgutils.la @os_libs@
sg_modes_SOURCES = sg_modes.c
-sg_modes_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_modes_LDADD = ../lib/libsgutils.la @os_libs@
sg_opcodes_SOURCES = sg_opcodes.c
-sg_opcodes_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_opcodes_LDADD = ../lib/libsgutils.la @os_libs@
sgp_dd_SOURCES = sgp_dd.c
-sgp_dd_LDADD = ../lib/libsgutils2.la @os_libs@ -lpthread
+sgp_dd_LDADD = ../lib/libsgutils.la @os_libs@ -lpthread
sg_persist_SOURCES = sg_persist.c
-sg_persist_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_persist_LDADD = ../lib/libsgutils.la @os_libs@
sg_prevent_SOURCES = sg_prevent.c
-sg_prevent_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_prevent_LDADD = ../lib/libsgutils.la @os_libs@
sg_raw_SOURCES = sg_raw.c
-sg_raw_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_raw_LDADD = ../lib/libsgutils.la @os_libs@
sg_rbuf_SOURCES = sg_rbuf.c
-sg_rbuf_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rbuf_LDADD = ../lib/libsgutils.la @os_libs@
sg_rdac_SOURCES = sg_rdac.c
-sg_rdac_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rdac_LDADD = ../lib/libsgutils.la @os_libs@
sg_read_SOURCES = sg_read.c
-sg_read_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_LDADD = ../lib/libsgutils.la @os_libs@
sg_readcap_SOURCES = sg_readcap.c
-sg_readcap_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_readcap_LDADD = ../lib/libsgutils.la @os_libs@
sg_read_buffer_SOURCES = sg_read_buffer.c
-sg_read_buffer_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_buffer_LDADD = ../lib/libsgutils.la @os_libs@
sg_read_long_SOURCES = sg_read_long.c
-sg_read_long_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_long_LDADD = ../lib/libsgutils.la @os_libs@
sg_reassign_SOURCES = sg_reassign.c
-sg_reassign_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_reassign_LDADD = ../lib/libsgutils.la @os_libs@
sg_requests_SOURCES = sg_requests.c
-sg_requests_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_requests_LDADD = ../lib/libsgutils.la @os_libs@
sg_reset_SOURCES = sg_reset.c
sg_reset_LDADD = @os_libs@
sg_rmsn_SOURCES = sg_rmsn.c
-sg_rmsn_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rmsn_LDADD = ../lib/libsgutils.la @os_libs@
sg_rtpg_SOURCES = sg_rtpg.c
-sg_rtpg_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rtpg_LDADD = ../lib/libsgutils.la @os_libs@
sg_safte_SOURCES = sg_safte.c
-sg_safte_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_safte_LDADD = ../lib/libsgutils.la @os_libs@
sg_sat_identify_SOURCES = sg_sat_identify.c
-sg_sat_identify_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_identify_LDADD = ../lib/libsgutils.la @os_libs@
sg_sat_phy_event_SOURCES = sg_sat_phy_event.c
-sg_sat_phy_event_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_phy_event_LDADD = ../lib/libsgutils.la @os_libs@
sg_sat_set_features_SOURCES = sg_sat_set_features.c
-sg_sat_set_features_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_set_features_LDADD = ../lib/libsgutils.la @os_libs@
sg_scan_SOURCES = sg_scan.c
-sg_scan_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_scan_LDADD = ../lib/libsgutils.la @os_libs@
sg_senddiag_SOURCES = sg_senddiag.c
-sg_senddiag_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_senddiag_LDADD = ../lib/libsgutils.la @os_libs@
sg_ses_SOURCES = sg_ses.c
-sg_ses_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_ses_LDADD = ../lib/libsgutils.la @os_libs@
sg_start_SOURCES = sg_start.c
-sg_start_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_start_LDADD = ../lib/libsgutils.la @os_libs@
sg_stpg_SOURCES = sg_stpg.c
-sg_stpg_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_stpg_LDADD = ../lib/libsgutils.la @os_libs@
sg_sync_SOURCES = sg_sync.c
-sg_sync_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sync_LDADD = ../lib/libsgutils.la @os_libs@
sg_test_rwbuf_SOURCES = sg_test_rwbuf.c
-sg_test_rwbuf_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_test_rwbuf_LDADD = ../lib/libsgutils.la @os_libs@
sg_turs_SOURCES = sg_turs.c
-sg_turs_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_turs_LDADD = ../lib/libsgutils.la @os_libs@
sg_verify_SOURCES = sg_verify.c
-sg_verify_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_verify_LDADD = ../lib/libsgutils.la @os_libs@
sg_vpd_SOURCES = sg_vpd.c sg_vpd_vendor.c
-sg_vpd_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_vpd_LDADD = ../lib/libsgutils.la @os_libs@
sg_write_buffer_SOURCES = sg_write_buffer.c
-sg_write_buffer_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_buffer_LDADD = ../lib/libsgutils.la @os_libs@
sg_write_long_SOURCES = sg_write_long.c
-sg_write_long_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_long_LDADD = ../lib/libsgutils.la @os_libs@
sg_wr_mode_SOURCES = sg_wr_mode.c
-sg_wr_mode_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_wr_mode_LDADD = ../lib/libsgutils.la @os_libs@
all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj

5
sg3_utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 21 14:00:16 CEST 2009 - hare@suse.de
- Clean up spec file and remove obsolete cruft
-------------------------------------------------------------------
Fri Apr 17 20:15:58 CEST 2009 - crrodriguez@suse.de

57
sg3_utils.diff
View File

@ -1,57 +0,0 @@
Index: archive/llseek.c
===================================================================
--- archive/llseek.c.orig
+++ archive/llseek.c
@@ -9,9 +9,9 @@
* Changed "ext2_" prefix to "llse".
*/
#define _XOPEN_SOURCE 500
#define _GNU_SOURCE
-
+#define _LARGEFILE64_SOURCE 1
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
@@ -30,9 +30,9 @@ extern llse_loff_t llse_llseek (unsigned
#include <syscall.h>
#else /* HAVE_LLSEEK */
-#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
+#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) || defined (__x86_64__) || defined (__powerpc64__)
#define my_llseek lseek
#else
@@ -42,12 +42,8 @@ static int _llseek (unsigned int, unsign
unsigned long, llse_loff_t *, unsigned int);
#ifdef __NR__llseek
-static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
- unsigned long, offset_low,llse_loff_t *,result,
- unsigned int, origin)
-
#else
/* no __NR__llseek on compilation machine - might give it explicitly */
static int _llseek (unsigned int fd, unsigned long oh,
@@ -63,13 +59,16 @@ static llse_loff_t my_llseek (unsigned i
unsigned int origin)
{
llse_loff_t result;
int retval;
-
+#if 0
retval = _llseek (fd, ((uint64_t) offset) >> 32,
((uint64_t) offset) & 0xffffffff,
&result, origin);
return (retval == -1 ? (llse_loff_t) retval : result);
+#else
+ return lseek64 (fd, offset, origin);
+#endif
}
#endif /* __alpha__ */

65
sg3_utils.spec
View File

@ -20,7 +20,7 @@ Url: http://sg.torque.net/sg/sg3_utils.html
Name: sg3_utils
%define sgver 1.27
License: BSD 3-Clause; GPL v2 only; GPL v2 or later
License: BSD 3-clause (or similar) ; GPL v2 only ; GPL v2 or later
Group: Hardware/Other
Provides: sg_utils
Provides: scsi
@ -28,12 +28,10 @@ Obsoletes: scsi <= 1.7_2.38_1.25_0.19_1.02_0.93
AutoReqProv: on
PreReq: %insserv_prereq
Version: 1.27
Release: 19
Release: 20
Summary: A collection of tools that send SCSI commands to devices
Source: http://sg.torque.net/sg/p/sg3_utils-%{sgver}.tar.bz2
Source2: http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh
Patch1: %{name}.diff
Patch2: sg3_lib_v1.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -52,7 +50,7 @@ Authors:
Kurt Garloff <garloff@suse.de>
%package devel
License: BSD 3-Clause; GPL v2 or later
License: BSD 3-clause (or similar) ; GPL v2 or later
Summary: A collection of tools that send SCSI commands to devices
Group: Development/Libraries/C and C++
AutoReqProv: on
@ -75,25 +73,16 @@ Authors:
%prep
%setup -q
%patch1
%patch2 -p1
%build
autoreconf -fi
export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\-O2/-Os/'`
CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" \
PREFIX=%{_prefix} LIBDIR=%{_libdir} CC=gcc \
%configure --disable-static --with-pic
%{__make} %{?jobs:-j%jobs}
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTDIR=$RPM_BUILD_ROOT%{_bindir} \
MANDIR=$RPM_BUILD_ROOT%{_mandir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
PREFIX=%{_prefix}
%makeinstall
install -m 755 scripts/scsi_logging_level $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{S:2} $RPM_BUILD_ROOT%{_bindir}
%{__rm} -f %{buildroot}%{_libdir}/*.la
grep -r -E '^#include[ \t]+[<"][^>"]+[">]' %{buildroot}%{_includedir} | awk -F: '{print $2}'
%post -p /sbin/ldconfig
@ -200,11 +189,11 @@ grep -r -E '^#include[ \t]+[<"][^>"]+[">]' %{buildroot}%{_includedir} | awk -F:
%doc %{_mandir}/man8/sg_sat_set_features.8.gz
%doc %{_mandir}/man8/sg_stpg.8.gz
%doc %{_mandir}/man8/sg3_utils.8.gz
%attr(755,root,root) %{_libdir}/libsgutils.so.*
%attr(755,root,root) %{_libdir}/libsgutils2.so.*
%files devel
%defattr(644,root,root)
%attr(755,root,root) %{_libdir}/libsgutils.so
%attr(755,root,root) %{_libdir}/libsgutils2.so
%attr(755,root,root) %dir %{_prefix}/include/scsi
%{_prefix}/include/scsi/sg_cmds.h
%{_prefix}/include/scsi/sg_cmds_basic.h
@ -221,45 +210,3 @@ test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROO
rm -rf $RPM_BUILD_DIR/sg3_utils-%{sgver}
%changelog
* Fri Apr 17 2009 crrodriguez@suse.de
- remove static libraries and "la" files
* Mon Jan 26 2009 hare@suse.de
- Fixes to rescan-scsi-bus.sh:
* Implement '--forcerescan' to force a rescan of existing devices
* Handle LUN changes correctly
* Check variables before evaluation
* Wed Oct 29 2008 garloff@suse.de
- rescan-scsi-bus.sh 1.29:
* Fix error in script (returning "" does not work)
* Support systems without /proc/scsi
- Don't install INSTALL
* Tue Sep 30 2008 hare@suse.de
- Add %%insserv_prereq (bnc#423204)
* Fri Sep 12 2008 garloff@suse.de
- Update rescan-scsi-bus.sh script to 1.28:
* Merge fixes from Hannes
* Minor cleanups
* Sort hosts numerically
* Tue Aug 12 2008 garloff@suse.de
- Update to sg3_utils-1.27:
* Adapted to linux-2.6.26 (sg_map26)
* sg_dd uses flock (rw -- if that fails ro)
* sg_get_config: OSSC feature (mmc6r02)
- Update to sg3_utils-1.26:
* Minor fixes and enhancements to
sg_sat_phy_event, sg_ses, sg_get_config, sg_verify, sg_vpd,
sg_inq, sg_modes, sg_start, sg_request, sg_luns, sg_dd,
sg_opcodes, sg_turs.
* sg_lib: asc/ascq update for spc4r15, osd2r03 service actions,
sense key specific unit attn queue overflow decoding, ...
* Restructuring: sg_lib -> sg_lib_data, sg_inq_data, (u)int64_t,
sg_io_linux -> lib/.
* Documentation enhancements.
* Wed Jul 16 2008 hare@suse.de
- Use correct length parameter for sg_inq (bnc#363438)
* Fri May 23 2008 hare@suse.de
- Use 'Provides' to clean update dependency
* Fri May 09 2008 schwab@suse.de
- Use autoreconf -i.
* Thu Apr 24 2008 hare@suse.de
- Split off from original scsi package.