Hello community,
here is the log from the commit of package tgt
checked in at Fri Aug 8 17:24:37 CEST 2008.
--------
--- tgt/tgt.changes 2007-08-09 19:12:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/tgt/tgt.changes 2008-08-08 15:02:36.174411000 +0200
@@ -1,0 +2,8 @@
+Fri Aug 8 15:01:22 CEST 2008 - hare@suse.de
+
+- Update to latest released version 20080805
+ * Include FCP backend
+ * Include FCoE backend
+ * Bugfixes
+
+-------------------------------------------------------------------
Old:
----
tgt-git-update
tgt.hash.patch
tgt-ibmvio-build-local
tgt-mmc-read-toc-swapped-args
tgt-r849.tar.bz2
tgt-update-scsi-header-file
New:
----
tgt-20080805.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tgt.spec ++++++
--- /var/tmp/diff_new_pack.p13879/_old 2008-08-08 17:24:26.000000000 +0200
+++ /var/tmp/diff_new_pack.p13879/_new 2008-08-08 17:24:26.000000000 +0200
@@ -1,37 +1,39 @@
#
-# spec file for package tgt (Version 0.1)
+# spec file for package tgt (Version 20080805)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: tgt
BuildRequires: libaio-devel openssl-devel
Obsoletes: iscsitarget
-URL: http://stgt.berlios.de
+Url: http://stgt.berlios.de
License: GPL v2 or later
Group: System/Daemons
-Prereq: %fillup_prereq %insserv_prereq
-Autoreqprov: on
-Version: 0.1
-Release: 23
-Requires: kernel
+PreReq: %fillup_prereq %insserv_prereq
+AutoReqProv: on
+Version: 20080805
+Release: 1
Summary: Generic Linux target framework (tgt)
-Source: %{name}-r849.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Source1: %{name}.init
Source2: scsi_tgt_if.h
Source3: %{name}.services
-Patch1: %{name}-git-update
-Patch2: %{name}-mmc-read-toc-swapped-args
-Patch10: %{name}-update-scsi-header-file
Patch11: %{name}-fix-build
-Patch12: %{name}-ibmvio-build-local
-Patch13: tgt.hash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -50,27 +52,24 @@
Mike Christie
%prep
-%setup -n %{name}-r849
-%patch1 -p1
-%patch2 -p1
-%patch10 -p1
+%setup -n %{name}-%{version}
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
+cp %{S:2} usr
%build
-cp %{S:2} usr/scsi_tgt_if.h
cd usr
%ifarch ppc ppc64
-IBMVIO=1
+%define backends ISCSI=1 FCP=1 FCOE=1 IBMVIO=1
%else
-IBMVIO=0
+%define backends ISCSI=1 FCP=1 FCOE=1
%endif
-%{__make} CFLAGS="${RPM_OPT_FLAGS}" ISCSI=1 IBMVIO=$IBMVIO
+%{__make} OPTFLAGS="${RPM_OPT_FLAGS}" %{backends}
%install
-install -vD usr/tgtd ${RPM_BUILD_ROOT}/usr/sbin/tgtd
-install -vD usr/tgtadm ${RPM_BUILD_ROOT}/usr/sbin/tgtadm
+cd usr
+%{__make} DESTDIR=${RPM_BUILD_ROOT} install
+cd ../scripts
+install -vD -m 755 tgt-admin ${RPM_BUILD_ROOT}/usr/sbin/tgt-admin
install -vD -m 755 %{S:1} ${RPM_BUILD_ROOT}/etc/init.d/tgtd
install -vD %{S:3} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/iscsitarget
@@ -81,22 +80,31 @@
%post
%{fillup_and_insserv tgtd}
+%preun
+%stop_on_removal
+
%postun
%{insserv_cleanup}
%files
-%attr(755,root,root)/usr/sbin/*
-%attr(755,root,root)/etc/init.d/tgtd
-%attr(644,root,root)/etc/sysconfig/SuSEfirewall2.d/services/iscsitarget
%defattr(-,root,root)
+/usr/sbin/*
+/etc/init.d/tgtd
+%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/iscsitarget
%doc README doc/README.iscsi doc/TODO
+%doc %{_mandir}/man8/*
%changelog
-* Thu Aug 09 2007 - olh@suse.de
+* Fri Aug 08 2008 hare@suse.de
+- Update to latest released version 20080805
+ * Include FCP backend
+ * Include FCoE backend
+ * Bugfixes
+* Thu Aug 09 2007 olh@suse.de
- remove inclusion of linux/hash.h, include it directly
-* Wed Apr 04 2007 - hare@suse.de
+* Wed Apr 04 2007 hare@suse.de
- Added service definition for SUSEFirewall2 (#251679)
-* Wed Apr 04 2007 - hare@suse.de
+* Wed Apr 04 2007 hare@suse.de
- Initial version svn r849
- Update to latest git version
- Fixes for build on openSUSE
++++++ scsi_tgt_if.h ++++++
--- tgt/scsi_tgt_if.h 2007-04-04 10:13:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/tgt/scsi_tgt_if.h 2008-08-08 14:45:06.639934000 +0200
@@ -23,13 +23,15 @@
#define __SCSI_TARGET_IF_H
/* user -> kernel */
-#define TGT_UEVENT_CMD_RSP 0x0001
-#define TGT_UEVENT_TSK_MGMT_RSP 0x0002
+#define TGT_UEVENT_CMD_RSP 0x0001
+#define TGT_UEVENT_IT_NEXUS_RSP 0x0002
+#define TGT_UEVENT_TSK_MGMT_RSP 0x0003
/* kernel -> user */
-#define TGT_KEVENT_CMD_REQ 0x1001
-#define TGT_KEVENT_CMD_DONE 0x1002
-#define TGT_KEVENT_TSK_MGMT_REQ 0x1003
+#define TGT_KEVENT_CMD_REQ 0x1001
+#define TGT_KEVENT_CMD_DONE 0x1002
+#define TGT_KEVENT_IT_NEXUS_REQ 0x1003
+#define TGT_KEVENT_TSK_MGMT_REQ 0x1004
struct tgt_event_hdr {
uint16_t version;
@@ -46,6 +48,7 @@
struct {
int host_no;
int result;
+ aligned_u64 itn_id;
aligned_u64 tag;
aligned_u64 uaddr;
aligned_u64 sense_uaddr;
@@ -55,15 +58,22 @@
} cmd_rsp;
struct {
int host_no;
- aligned_u64 mid;
int result;
+ aligned_u64 itn_id;
+ aligned_u64 mid;
} tsk_mgmt_rsp;
-
+ struct {
+ __s32 host_no;
+ __s32 result;
+ aligned_u64 itn_id;
+ __u32 function;
+ } it_nexus_rsp;
/* kernel -> user */
struct {
int host_no;
uint32_t data_len;
+ aligned_u64 itn_id;
uint8_t scb[16];
uint8_t lun[8];
int attribute;
@@ -71,16 +81,25 @@
} cmd_req;
struct {
int host_no;
- aligned_u64 tag;
int result;
+ aligned_u64 itn_id;
+ aligned_u64 tag;
} cmd_done;
struct {
int host_no;
int function;
+ aligned_u64 itn_id;
aligned_u64 tag;
uint8_t lun[8];
aligned_u64 mid;
} tsk_mgmt_req;
+ struct {
+ __s32 host_no;
+ __u32 function;
+ aligned_u64 itn_id;
+ __u32 max_cmds;
+ __u8 initiator_id[16];
+ } it_nexus_req;
} p;
} __attribute__ ((aligned (sizeof(uint64_t))));
++++++ tgt-r849.tar.bz2 -> tgt-20080805.tar.bz2 ++++++
++++ 40045 lines of diff (skipped)
++++++ tgt-fix-build ++++++
--- tgt/tgt-fix-build 2007-04-04 10:10:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/tgt/tgt-fix-build 2008-08-08 14:59:02.012924000 +0200
@@ -1,71 +1,58 @@
+diff --git a/scripts/tgt-setup-lun b/scripts/tgt-setup-lun
+index 1e214ee..2ae9193 100755
+--- a/scripts/tgt-setup-lun
++++ b/scripts/tgt-setup-lun
+@@ -1,3 +1,5 @@
++#!/bin/bash
++
+ # LUN assignment script
+ #
+ # Copyright (C) 2007 Erez Zilber
+@@ -17,8 +19,6 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ # 02110-1301 USA
+
+-#!/bin/bash
+-
+ usage()
+ {
+ name=$(basename $0)
diff --git a/usr/Makefile b/usr/Makefile
-index 30cd34a..125274b 100644
+index 4245709..1720d89 100644
--- a/usr/Makefile
+++ b/usr/Makefile
-@@ -1,3 +1,7 @@
-+#
-+# Makefile for tgt userspace tools
-+#
-+
- ifneq ($(XEN),)
- XEN_ROOT = ../..
- include $(XEN_ROOT)/tools/Rules.mk
-@@ -6,9 +10,9 @@ INCLUDES += -I$(XEN_LIBXC) -I$(XEN_XENST
- INCLUDES += -I$(LINUX_ROOT)/include -I.
- LIBAIO_DIR = ../libaio/src
- AIOLIBS := $(LIBAIO_DIR)/libaio.a
--CFLAGS += -I$(XEN_LIBXC) -I$(LIBAIO_DIR)
--CFLAGS += $(INCLUDES) -I. -I../../xenstore
--CFLAGS += -DXEN -DUSE_KERNEL
-+INCLUDES += -I$(XEN_LIBXC) -I$(LIBAIO_DIR)
-+INCLUDES += -I. -I../../xenstore
-+DEFINES += -DXEN -DUSE_KERNEL
- LIBS := -L. -L.. -L../lib
- LIBS += -L$(XEN_LIBXC)
- LIBS += -lxenctrl
-@@ -16,7 +20,7 @@ LIBS += -L$(XEN_XENSTORE) -lxenstore $(A
- TGTD_OBJS += $(addprefix xen/, xen.o xs_api.o xenbus.o)
- TGTD_OBJS += tgtif.o bs_xen.o
- else
--INCLUDES += -I../include -I$(KERNELSRC)/include
-+INCLUDES += -I../include
- LIBS += -laio
- endif
-
-@@ -26,14 +30,14 @@ else
- TGTD_OBJS += spt_sgv3.o
- endif
-
--ifneq ($(IBMVIO),)
--CFLAGS += -DIBMVIO -DUSE_KERNEL
-+ifeq ($(IBMVIO),1)
-+DEFINES += -DIBMVIO -DUSE_KERNEL
- TGTD_OBJS += $(addprefix ibmvio/, ibmvio.o)
- TGTD_OBJS += bs_mmap.o tgtif.o
- endif
-
--ifneq ($(ISCSI),)
--CFLAGS += -DISCSI
-+ifeq ($(ISCSI),1)
-+DEFINES += -DISCSI
- TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o iscsid.o target.o \
- chap.o transport.o iscsi_tcp.o)
- TGTD_OBJS += bs_aio.o
-@@ -41,7 +45,8 @@ LIBS += -lcrypto -lpthread
- endif
-
- INCLUDES += -I.
--CFLAGS += -Wall -g -O2 -Wstrict-prototypes -fPIC -D_LARGEFILE64_SOURCE $(INCLUDES)
-+DEFINES += -D_LARGEFILE64_SOURCE
-+CFLAGS += -Wall -g -O2 -Wstrict-prototypes -fPIC
-
- PROGRAMS += tgtd tgtadm
- TGTD_OBJS += tgtd.o mgmt.o target.o spc.o sbc.o mmc.o osd.o spt.o scsi.o log.o \
-@@ -62,3 +67,7 @@ endif
+@@ -50,7 +50,7 @@ INCLUDES += -I. -I../include -I$(KERNELSRC)/include
- clean:
- rm -f *.o $(PROGRAMS) iscsi/*.o ibmvio/*.o xen/*.o
-+
-+%.o: %.c
-+ $(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
-+
+ CFLAGS += -D_GNU_SOURCE
+ CFLAGS += $(INCLUDES)
+-CFLAGS += -g -O2 -Wall -Wstrict-prototypes -fPIC
++CFLAGS += $(OPTFLAGS)
+
+ LIBS += -lpthread
+
+diff --git a/usr/fc/fc.c b/usr/fc/fc.c
+index febb1e9..59f7573 100644
+--- a/usr/fc/fc.c
++++ b/usr/fc/fc.c
+@@ -29,6 +29,8 @@
+ #include
+ #include
+ #include
++#include
++typedef __u8 u8;
+ #include
+ #include
+
+diff --git a/usr/tgtif.c b/usr/tgtif.c
+index fd5ad5b..9b87b13 100644
+--- a/usr/tgtif.c
++++ b/usr/tgtif.c
+@@ -36,7 +36,7 @@
+ #ifndef aligned_u64
+ #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+ #endif
+-#include
++#include "scsi_tgt_if.h"
+
+ #include "list.h"
+ #include "util.h"
++++++ tgt.init ++++++
--- tgt/tgt.init 2007-04-03 15:37:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/tgt/tgt.init 2008-08-08 14:56:21.357811000 +0200
@@ -4,14 +4,14 @@
#
### BEGIN INIT INFO
# Provides: tgtd
-# Required-Start: $network
+# Required-Start: $remote_fs $network
# Should-Start:
# Required-Stop:
# Should-Stop:
# Default-Start: 3 5
# Default-Stop:
-# Short-Description: Starts and stops the generic storage target daemon
-#
+# Short-Description: generic storage target daemon
+# Description: Starts and stops the generic storage target subsystem
### END INIT INFO
#
@@ -48,7 +48,7 @@
fi
rc_status -v
;;
- restart)
+ restart|reload)
$0 stop
$0 start
;;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
