Hello community,
here is the log from the commit of package scsi
checked in at Fri Aug 25 15:01:55 CEST 2006.
--------
--- scsi/scsi.changes 2006-07-29 14:19:48.000000000 +0200
+++ scsi/scsi.changes 2006-08-25 11:15:47.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 25 11:15:13 CEST 2006 - garloff@suse.de
+
+- Include smp_utils-0.91 (SAS Management Protocol).
+- Compile with -Os rather than -O2.
+
+-------------------------------------------------------------------
New:
----
smp_utils-0.91.tgz
smp_utils-Makefile.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scsi.spec ++++++
--- /var/tmp/diff_new_pack.hY1BJ1/_old 2006-08-25 15:01:33.000000000 +0200
+++ /var/tmp/diff_new_pack.hY1BJ1/_new 2006-08-25 15:01:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package scsi (Version 1.7_2.36_1.22_0.18_0.99)
+# spec file for package scsi (Version 1.7_2.36_1.22_0.18_0.99_0.91)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,11 +17,12 @@
%define sgutver 1.22
%define lsscsiver 0.18
%define sdparmver 0.99
+%define smputver 0.91
License: GPL
Group: Hardware/Other
Provides: scsiinfo sg_utils scsidev
Autoreqprov: on
-Version: 1.7_2.36_1.22_0.18_0.99
+Version: 1.7_2.36_1.22_0.18_0.99_0.91
Release: 1
Summary: SCSI Tools (Text Mode)
Source: scsiinfo-%{sinfover}.tar.gz
@@ -34,6 +35,8 @@
Source4: http://www.torque.net/sg/p/sg3_utils-%{sgutver}.tgz
Source6: http://www.torque.net/scsi/lsscsi-%{lsscsiver}.tgz
Source7: http://sg.torque.net/sg/p/sdparm-%{sdparmver}.tgz
+Source8: http://sg.torque.net/sg/p/smp_utils-%{smputver}.tgz
+Patch8: smp_utils-Makefile.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 800
PreReq: %fillup_prereq %insserv_prereq
@@ -67,6 +70,8 @@
* lsscsi: Lists SCSI devices on your system.
+* smp_utils: SAS Management Protocol utilities.
+
Warning: Some of these tools access the internals of your system and
misuse of them may render your system inoperable.
@@ -100,14 +105,18 @@
Eric Youngdale
%prep
-%setup -n scsiinfo-%{sinfover} -b2 -b4 -b6 -b7
+%setup -n scsiinfo-%{sinfover} -b2 -b4 -b6 -b7 -b8
%patch -p1
%patch1 -p1
cd ../scsidev-%{sdevver}
%patch2
#cd ../sg3_utils-%{sgutver}
+cd ../smp_utils-%{smputver}
+%patch8 -p1
%build
+# None of these is performance-critical:
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\-O2/-Os/'`
# scsiinfo
cd ../scsiinfo-%{sinfover}
make clean
@@ -115,11 +124,11 @@
# scsidev
cd ../scsidev-%{sdevver}
autoreconf
-CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --prefix=/usr --with-infodir=%{_infodir} --with-mandir=%{_mandir}
+CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --prefix=%{_prefix} --with-infodir=%{_infodir} --with-mandir=%{_mandir}
make
# sg3_utils
cd ../sg3_utils-%{sgutver}
-make CFLAGS="$RPM_OPT_FLAGS -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" PREFIX=/usr LIBDIR=%{_libdir}
+make CFLAGS="$RPM_OPT_FLAGS -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" PREFIX=%{_prefix} LIBDIR=%{_libdir}
mv README README.sg
# NOTE: COuld compile some files from examples/ as well
# lsscsi
@@ -131,11 +140,16 @@
# sdparm
cd ../sdparm-%{sdparmver}
autoreconf
-CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir}
+CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir}
make
mv README README.sdparm
mv ChangeLog ChangeLog.sdparm
#mv NEWS NEWS.sdparm
+# smp_utils
+cd ../smp_utils-%{smputver}
+make CC=gcc PREFIX=%{_prefix} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+mv README README.smp_utils
+mv CHANGELOG CHANGELOG.smp_utils
%install
# scsiinfo
@@ -152,7 +166,7 @@
cd ../sg3_utils-%{sgutver}
make install DESTDIR=$RPM_BUILD_ROOT INSTDIR=$RPM_BUILD_ROOT%{_bindir} \
MANDIR=$RPM_BUILD_ROOT%{_mandir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
- PREFIX=/usr
+ PREFIX=%{_prefix}
# NOTE: Could install some files from the examples dir as well
# lsscsi
cd ../lsscsi-%{lsscsiver}
@@ -160,6 +174,9 @@
# sdparm
cd ../sdparm-%{sdparmver}
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir} bindir=/sbin
+# smp_utils
+cd ../smp_utils-%{smputver}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir}
# sysconfig
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates/
install %SOURCE5 $RPM_BUILD_ROOT/var/adm/fillup-templates/
@@ -228,12 +245,12 @@
%attr(755,root,root) %{_libdir}/libsgutils.a
%attr(755,root,root) %{_libdir}/libsgutils.la
%attr(755,root,root) %{_libdir}/libsgutils.so*
-%attr(755,root,root) %dir /usr/include/scsi
-%attr(644,root,root) /usr/include/scsi/sg_cmds.h
-%attr(644,root,root) /usr/include/scsi/sg_lib.h
-%attr(644,root,root) /usr/include/scsi/sg_pt.h
-%attr(644,root,root) /usr/include/scsi/sg_io_linux.h
-%attr(644,root,root) /usr/include/scsi/sg_linux_inc.h
+%attr(755,root,root) %dir %{_prefix}/include/scsi
+%attr(644,root,root) %{_prefix}/include/scsi/sg_cmds.h
+%attr(644,root,root) %{_prefix}/include/scsi/sg_lib.h
+%attr(644,root,root) %{_prefix}/include/scsi/sg_pt.h
+%attr(644,root,root) %{_prefix}/include/scsi/sg_io_linux.h
+%attr(644,root,root) %{_prefix}/include/scsi/sg_linux_inc.h
%doc %{_mandir}/man8/sg_dd.8.gz
%doc %{_mandir}/man8/sgp_dd.8.gz
%doc %{_mandir}/man8/sgm_dd.8.gz
@@ -282,28 +299,57 @@
%attr(755,root,root) /sbin/sdparm
%doc %{_mandir}/man8/sdparm.8.gz
%doc ../sdparm-%{sdparmver}/README.sdparm ../sdparm-%{sdparmver}/ChangeLog.sdparm
+# smp_utils
+%doc ../smp_utils-%{smputver}/README.smp_utils ../smp_utils-%{smputver}/CHANGELOG.smp_utils
+%doc ../smp_utils-%{smputver}/doc/*.html
+%{_bindir}//smp_conf_route_info
+%{_bindir}//smp_discover
+%{_bindir}//smp_discover_list
+%{_bindir}//smp_phy_control
+%{_bindir}//smp_phy_test
+%{_bindir}//smp_read_gpio
+%{_bindir}//smp_rep_general
+%{_bindir}//smp_rep_manufacturer
+%{_bindir}//smp_rep_phy_err_log
+%{_bindir}//smp_rep_phy_sata
+%{_bindir}//smp_rep_route_info
+%{_bindir}//smp_write_gpio
+%{_mandir}//man8/smp_conf_route_info.8.gz
+%{_mandir}//man8/smp_discover.8.gz
+%{_mandir}//man8/smp_discover_list.8.gz
+%{_mandir}//man8/smp_phy_control.8.gz
+%{_mandir}//man8/smp_phy_test.8.gz
+%{_mandir}//man8/smp_read_gpio.8.gz
+%{_mandir}//man8/smp_rep_general.8.gz
+%{_mandir}//man8/smp_rep_manufacturer.8.gz
+%{_mandir}//man8/smp_rep_phy_err_log.8.gz
+%{_mandir}//man8/smp_rep_phy_sata.8.gz
+%{_mandir}//man8/smp_rep_route_info.8.gz
+%{_mandir}//man8/smp_utils.8.gz
+%{_mandir}//man8/smp_write_gpio.8.gz
+
%files -n xscsi
%defattr(-,root,root)
# scsiinfo, Tk frontend
-/usr/bin/scsi-config
-/usr/bin/tk_scsiformat
-%dir /usr/lib/scsi
-/usr/lib/scsi/cache
-/usr/lib/scsi/control
-/usr/lib/scsi/disconnect
-/usr/lib/scsi/error
-/usr/lib/scsi/format
-/usr/lib/scsi/generic
-/usr/lib/scsi/inquiry
-/usr/lib/scsi/notch
-/usr/lib/scsi/overview
-/usr/lib/scsi/peripheral
-/usr/lib/scsi/rigid
-/usr/lib/scsi/save-changes
-/usr/lib/scsi/save-file
-/usr/lib/scsi/tworands
-/usr/lib/scsi/verify
+%{_prefix}/bin/scsi-config
+%{_prefix}/bin/tk_scsiformat
+%dir %{_prefix}/lib/scsi
+%{_prefix}/lib/scsi/cache
+%{_prefix}/lib/scsi/control
+%{_prefix}/lib/scsi/disconnect
+%{_prefix}/lib/scsi/error
+%{_prefix}/lib/scsi/format
+%{_prefix}/lib/scsi/generic
+%{_prefix}/lib/scsi/inquiry
+%{_prefix}/lib/scsi/notch
+%{_prefix}/lib/scsi/overview
+%{_prefix}/lib/scsi/peripheral
+%{_prefix}/lib/scsi/rigid
+%{_prefix}/lib/scsi/save-changes
+%{_prefix}/lib/scsi/save-file
+%{_prefix}/lib/scsi/tworands
+%{_prefix}/lib/scsi/verify
%doc %{_mandir}/man8/tk_scsiformat.8.gz
%doc %{_mandir}/man8/scsi-config.8.gz
@@ -312,7 +358,8 @@
rm -rf $RPM_BUILD_DIR/scsidev-%{sdevver}
rm -rf $RPM_BUILD_DIR/sg3_utils-%{sgutver}
rm -rf $RPM_BUILD_DIR/scsiinfo-%{sinfover}
-rm -rf $RPM_BUILD_DIR/lsscsi-%{lsscsiver}
+rm -rf $RPM_BUILD_DIR/sdparm-%{sdparmver}
+rm -rf $RPM_BUILD_DIR/smp_utils-%{smputver}
%post
%{fillup_and_insserv -n scsidev -p boot.scsidev}
@@ -321,6 +368,9 @@
%{insserv_cleanup}
%changelog -n scsi
+* Fri Aug 25 2006 - garloff@suse.de
+- Include smp_utils-0.91 (SAS Management Protocol).
+- Compile with -Os rather than -O2.
* Sat Jul 29 2006 - garloff@suse.de
- rescan-scsi-bus.sh:
* -L MAXLUN parameter to scan beyond SPI LUNs
++++++ smp_utils-Makefile.diff ++++++
Index: smp_utils-0.91/Makefile
===================================================================
--- smp_utils-0.91.orig/Makefile
+++ smp_utils-0.91/Makefile
@@ -26,9 +26,10 @@ LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE
EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS)
# CFLAGS = -O2 -Wall -W $(EXTRA_FLAGS)
# CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
-CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
+RPM_OPT_FLAGS = -g -O2 -Wall
+CFLAGS = $(RPM_OPT_FLAGS) -W -pedantic -std=c99 $(EXTRA_FLAGS)
CFLAGS_PTHREADS = -D_REENTRANT
LDFLAGS =
@@ -100,13 +101,13 @@ smp_discover_list: smp_discover_list.o l
install: $(EXECS)
install -d $(INSTDIR)
for name in $^; \
- do install -s -o root -g root -m 755 $$name $(INSTDIR); \
+ do install -s -m 755 $$name $(INSTDIR); \
done
install -d $(MANDIR)/$(MAN_PREF)
for mp in $(MAN_PGS); \
- do install -o root -g root -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
+ do install -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
done
uninstall:
Index: smp_utils-0.91/mpt/Makefile
===================================================================
--- smp_utils-0.91.orig/mpt/Makefile
+++ smp_utils-0.91/mpt/Makefile
@@ -16,9 +16,10 @@ LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE
EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS)
# CFLAGS = -O2 -Wall -W $(EXTRA_FLAGS)
# CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
-CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
+RPM_OPT_FLAGS = -g -O2 -Wall
+CFLAGS = $(RPM_OPT_FLAGS) -W -pedantic -std=c99 $(EXTRA_FLAGS)
LDFLAGS =
# LDFLAGS = -v -lm
@@ -34,13 +35,13 @@ clean:
install: $(EXECS)
install -d $(INSTDIR)
for name in $^; \
- do install -s -o root -g root -m 755 $$name $(INSTDIR); \
+ do install -s -m 755 $$name $(INSTDIR); \
done
install -d $(MANDIR)/$(MAN_PREF)
for mp in $(MAN_PGS); \
- do install -o root -g root -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
+ do install -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
done
uninstall:
Index: smp_utils-0.91/sas_tpl/Makefile
===================================================================
--- smp_utils-0.91.orig/sas_tpl/Makefile
+++ smp_utils-0.91/sas_tpl/Makefile
@@ -15,9 +15,10 @@ OS_FLAGS = -DSMP_UTILS_LINUX
LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
EXTRA_FLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS)
# CFLAGS = -O2 -I .. -Wall -W $(EXTRA_FLAGS)
-CFLAGS = -g -O2 -I .. -Wall -W $(EXTRA_FLAGS)
+RPM_OPT_FLAGS = -g -O2 -Wall
+CFLAGS = $(RPM_OPT_FLAGS) -I .. -W $(EXTRA_FLAGS)
# CFLAGS = -g -O2 -I .. -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
LDFLAGS =
# LDFLAGS = -v -lm
@@ -34,13 +35,13 @@ clean:
install: $(EXECS)
install -d $(INSTDIR)
for name in $^; \
- do install -s -o root -g root -m 755 $$name $(INSTDIR); \
+ do install -s -m 755 $$name $(INSTDIR); \
done
install -d $(MANDIR)/$(MAN_PREF)
for mp in $(MAN_PGS); \
- do install -o root -g root -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
+ do install -m 644 $$mp $(MANDIR)/$(MAN_PREF); \
gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
done
uninstall:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org