[scsi-target-utils/f20: 2/2] update to 1.0.40-1
Andy Grover
grover at fedoraproject.org
Fri Oct 4 22:58:35 UTC 2013
commit cebdd1cd12f89fd8d3c56f51fbd4e21293dd1d23
Author: Andy Grover <agrover at redhat.com>
Date: Fri Oct 4 15:30:16 2013 -0700
update to 1.0.40-1
Signed-off-by: Andy Grover <agrover at redhat.com>
.gitignore | 1 +
...dhatify-docs.patch => 0001-redhatify-docs.patch | 39 +++++++++---
...k.patch => 0002-remove-check-for-xsltproc.patch | 33 ++++++----
...fault-config.patch => 0003-default-config.patch | 15 +++-
0004-fix-no-module-build.patch | 28 ++++++++
...r-Makefile-fix-typo-in-bs_aio-so-filename.patch | 27 ++++++++
scsi-target-utils-include-dirs.patch | 25 -------
scsi-target-utils.spec | 68 +++++++++++++++-----
sources | 2 +-
9 files changed, 168 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab59218..222fa69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/tgt-1.0.37.tar.gz
/tgt-1.0.38.tar.gz
/tgt-1.0.39.tar.gz
+/tgt-1.0.40.tar.gz
diff --git a/scsi-target-utils-redhatify-docs.patch b/0001-redhatify-docs.patch
similarity index 78%
rename from scsi-target-utils-redhatify-docs.patch
rename to 0001-redhatify-docs.patch
index 9676b36..5bbe26b 100644
--- a/scsi-target-utils-redhatify-docs.patch
+++ b/0001-redhatify-docs.patch
@@ -1,5 +1,16 @@
+From 0861a02865e8bb6d5960fc1bee2f94baa633c950 Mon Sep 17 00:00:00 2001
+From: Andy Grover <agrover at redhat.com>
+Date: Tue, 4 Oct 2011 11:32:38 -0700
+Subject: [PATCH 1/5] redhatify-docs
+
+---
+ README | 23 ---------------------
+ doc/README.iscsi | 17 +++++++++------
+ doc/README.iser | 57 ++++++++++++++++++------------------------------------
+ 3 files changed, 29 insertions(+), 68 deletions(-)
+
diff --git a/README b/README
-index 92b7528..22b963f 100644
+index c3f505c..42d81a2 100644
--- a/README
+++ b/README
@@ -9,17 +9,6 @@ Currently, tgt supports the following target drivers:
@@ -80,7 +91,7 @@ index 4ff3028..b74a73a 100644
The following example creates a target with id 1 (the iqn is
iqn.2001-04.com.example:storage.disk2.amiens.sys1.xyz) and adds a
diff --git a/doc/README.iser b/doc/README.iser
-index 697b507..270a37e 100644
+index 0f5fafd..7603d3c 100644
--- a/doc/README.iser
+++ b/doc/README.iser
@@ -1,5 +1,21 @@
@@ -105,7 +116,7 @@ index 697b507..270a37e 100644
Copyright (C) 2007 Pete Wyckoff <pw at osc.edu>
Copyright (C) 2011 Alexander Nezhinsky <alexandern at voltaire.com>
-@@ -235,35 +251,7 @@ add padding either.
+@@ -235,42 +251,7 @@ add padding either.
3. Using iSER
@@ -118,8 +129,12 @@ index 697b507..270a37e 100644
-As iSCSI support is compiled in by default, there is no need to specify
-additional symbols for it.
-
--You'll need to have two libraries installed on your system:
--libibverbs.so and librdmacm.so.
+-For build purposes, you'll need to have two libraries installed
+-on your system: libibverbs-devel and librdmacm-devel.
+-
+-To run iser, you'lll need the binary form of these libraries,
+-libibverbs.so and librdmacm.so along with device specific user
+-space library such as libmlx4 for Mellanox ConnectX HCAs.
-
-If they are installed in the normal system paths (/usr/include and
-/usr/lib or /usr/lib64), they will be found automatically. Otherwise,
@@ -136,22 +151,25 @@ index 697b507..270a37e 100644
-possibly also have to set, e.g., LD_LIBRARY_PATH=/usr/local/lib in
-your environment to find the shared libraries at runtime.
-
+-The libraries mentioned is this section have pre-set packages provided
+-the by various distributions, e.g RPMs for Fedora, RedHat and Suse,
+-or DEBs for Debian and Ubuntu.
-
-3.2. Running tgtd
+3.1. Running tgtd
Start the daemon (as root):
-@@ -281,7 +269,7 @@ as all RDMA devices. Both use the same default iSCSI port, 3260.
- Clients on TCP or RDMA will connect to the same tgtd instance.
-
+@@ -294,7 +275,7 @@ It's recommended to use the rping tool provided by librdmacm-utils
+ for quick RDMA connectivity testing between the initiator and the
+ target nodes.
-3.3. Configuring tgtd
+3.2. Configuring tgtd
Configure the running target with one or more devices, using the
tgtadm program you just built (also as root). Full information is
-@@ -299,7 +287,7 @@ Here is a quick-start example:
+@@ -312,7 +293,7 @@ Here is a quick-start example:
--bstype rdwr
@@ -160,3 +178,6 @@ index 697b507..270a37e 100644
To make your initiator use RDMA, make sure the "ib_iser" module is
loaded in your kernel. Then do discovery as usual, over TCP:
+--
+1.7.1
+
diff --git a/scsi-target-utils-remove-xsltproc-check.patch b/0002-remove-check-for-xsltproc.patch
similarity index 77%
rename from scsi-target-utils-remove-xsltproc-check.patch
rename to 0002-remove-check-for-xsltproc.patch
index 59bcbd7..d00ebd1 100644
--- a/scsi-target-utils-remove-xsltproc-check.patch
+++ b/0002-remove-check-for-xsltproc.patch
@@ -1,25 +1,27 @@
-commit 8d56d4c034d9e02718566747eb147db5a6835ebc
-Author: Andy Grover <agrover at redhat.com>
-Date: Wed Nov 2 22:15:32 2011 -0700
+From c80e525b213883ba0a6b21c27089cd18c4cf05d1 Mon Sep 17 00:00:00 2001
+From: Andy Grover <agrover at redhat.com>
+Date: Wed, 2 Nov 2011 22:15:32 -0700
+Subject: [PATCH 2/5] remove check for xsltproc
- remove check for xsltproc
-
- It should always be there, since we added libxslt as a BuildRequires.
-
- Use local stylesheet.
-
- Signed-off-by: Andy Grover <agrover at redhat.com>
+It should always be there, since we added libxslt as a BuildRequires.
+
+Use local stylesheet.
+
+Signed-off-by: Andy Grover <agrover at redhat.com>
+---
+ doc/Makefile | 23 +++++++++++++----------
+ 1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile
-index f6352b3..0fc29f5 100644
+index 0516dc8..91a51f6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
-@@ -32,35 +32,38 @@ clean:
+@@ -33,35 +33,38 @@ clean:
rm -f $(XMLMAN) $(XMLHTML)
-rm -f manpages htmlpages
-+STYLEMAN = /usr/share/sgml/docbook/xsl-stylesheets-*/manpages/docbook.xsl
-+STYLEHTML = /usr/share/sgml/docbook/xsl-stylesheets-*/html/docbook.xsl
++STYLEMAN = /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl
++STYLEHTML = /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl
+
manpages/tgtd.8: tgtd.8.xml
- -test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
@@ -63,3 +65,6 @@ index f6352b3..0fc29f5 100644
manpages/tgt-setup-lun.8: tgt-setup-lun.8.xml
-test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+--
+1.7.1
+
diff --git a/scsi-target-utils-default-config.patch b/0003-default-config.patch
similarity index 74%
rename from scsi-target-utils-default-config.patch
rename to 0003-default-config.patch
index a0f2726..038ff5c 100644
--- a/scsi-target-utils-default-config.patch
+++ b/0003-default-config.patch
@@ -1,8 +1,12 @@
-commit 9ff12c926df0f01285f0fc6ba876286007611d60
-Author: Andy Grover <agrover at redhat.com>
-Date: Tue Jun 18 13:43:22 2013 -0700
+From ae49713dabee9befd1e8c43036c369a416099793 Mon Sep 17 00:00:00 2001
+From: Andy Grover <agrover at redhat.com>
+Date: Tue, 18 Jun 2013 13:43:22 -0700
+Subject: [PATCH 3/5] default-config
- default-config
+---
+ scripts/initd.sample | 2 +-
+ scripts/tgt-admin | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/initd.sample b/scripts/initd.sample
index 9ca86ce..7b67722 100755
@@ -38,3 +42,6 @@ index d374172..bbae0dd 100755
sub usage {
print <<EOF;
+--
+1.7.1
+
diff --git a/0004-fix-no-module-build.patch b/0004-fix-no-module-build.patch
new file mode 100644
index 0000000..47cce44
--- /dev/null
+++ b/0004-fix-no-module-build.patch
@@ -0,0 +1,28 @@
+From 4bd0ae933cf06a9190bace18574d2057aa3ec5e5 Mon Sep 17 00:00:00 2001
+From: Andy Grover <agrover at redhat.com>
+Date: Fri, 4 Oct 2013 14:23:03 -0700
+Subject: [PATCH 4/5] fix no-module build
+
+Signed-off-by: Andy Grover <agrover at redhat.com>
+---
+ usr/Makefile | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/usr/Makefile b/usr/Makefile
+index 60bff6d..7bd7d12 100644
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -94,8 +94,10 @@ bs_rbd.so: bs_rbd.c
+ install: $(PROGRAMS) $(MODULES)
+ install -d -m 755 $(DESTDIR)$(sbindir)
+ install -m 755 $(PROGRAMS) $(DESTDIR)$(sbindir)
++ifneq ($(MODULES),)
+ install -d -m 755 $(DESTDIR)$(libdir)/backing-store
+ install -m 755 $(MODULES) $(DESTDIR)$(libdir)/backing-store
++endif
+
+ .PHONY: clean
+ clean:
+--
+1.7.1
+
diff --git a/0005-usr-Makefile-fix-typo-in-bs_aio-so-filename.patch b/0005-usr-Makefile-fix-typo-in-bs_aio-so-filename.patch
new file mode 100644
index 0000000..91c0867
--- /dev/null
+++ b/0005-usr-Makefile-fix-typo-in-bs_aio-so-filename.patch
@@ -0,0 +1,27 @@
+From 2f9ae873db077ccf12562d0e5042510da9a7b55e Mon Sep 17 00:00:00 2001
+From: Dan Mick <dan.mick at inktank.com>
+Date: Thu, 3 Oct 2013 14:42:14 -0700
+Subject: [PATCH 5/5] usr/Makefile: fix typo in bs_aio so filename
+
+Signed-off-by: Dan Mick <dan.mick at inktank.com>
+Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
+---
+ usr/Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/usr/Makefile b/usr/Makefile
+index 7bd7d12..7e8623b 100644
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -19,7 +19,7 @@ endif
+
+ ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
+ CFLAGS += -DUSE_EVENTFD
+-MODULES += bs_aio.o
++MODULES += bs_aio.so
+ endif
+
+ ifneq ($(ISCSI_RDMA),)
+--
+1.7.1
+
diff --git a/scsi-target-utils.spec b/scsi-target-utils.spec
index ce2899a..8af1026 100644
--- a/scsi-target-utils.spec
+++ b/scsi-target-utils.spec
@@ -1,13 +1,11 @@
%global oname tgt
+
%ifnarch s390 s390x
%global with_rdma 1
%endif
-# Don't enable rbd b/c too many deps, pending upstream modularization
-# but it's here for custom RPM builds to turn on if desired
-# %global with_rbd 1
Name: scsi-target-utils
-Version: 1.0.39
+Version: 1.0.40
Release: 1%{?dist}
Summary: The SCSI target daemon and utility programs
@@ -20,9 +18,11 @@ Source2: sysconfig.tgtd
Source3: targets.conf
Source4: sample.conf
Source5: tgtd.conf
-Patch0: scsi-target-utils-redhatify-docs.patch
-Patch1: scsi-target-utils-remove-xsltproc-check.patch
-Patch2: scsi-target-utils-default-config.patch
+Patch0: 0001-redhatify-docs.patch
+Patch1: 0002-remove-check-for-xsltproc.patch
+Patch2: 0003-default-config.patch
+Patch3: 0004-fix-no-module-build.patch
+Patch4: 0005-usr-Makefile-fix-typo-in-bs_aio-so-filename.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,10 +31,6 @@ BuildRequires: pkgconfig libxslt docbook-style-xsl systemd-units
BuildRequires: libibverbs-devel librdmacm-devel
Requires: libibverbs librdmacm
%endif
-%if 0%{?with_rbd}
-BuildRequires: ceph-devel
-Requires: ceph
-%endif
Requires: lsof sg3_utils
Requires(post): systemd-units
@@ -42,15 +38,36 @@ Requires(post): systemd-units
The SCSI target package contains the daemon and tools to setup a SCSI targets.
Currently, software iSCSI targets are supported.
+%package rbd
+Summary: Support for the Ceph rbd backstore to scsi-target-utils
+Group: System Environment/Daemons
+BuildRequires: ceph-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description rbd
+Adds support for the Ceph rbd backstore to scsi-target-utils.
+
+%package aio
+Summary: Support for the aio backstore to scsi-target-utils
+Group: System Environment/Daemons
+BuildRequires: libaio-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description aio
+Adds support for the aio backstore to scsi-target-utils.
+
+
%prep
%setup -q -n %{oname}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
%{__sed} -i -e 's|-g -O2 -Wall|%{optflags}|' Makefile
-%{__make} %{?_smp_mflags} %{?with_rdma:ISCSI_RDMA=1} %{?with_rbd:CEPH_RBD=1} libdir=%{_libdir}/tgt
+%{__make} %{?_smp_mflags} %{?with_rdma:ISCSI_RDMA=1} CEPH_RBD=1 libdir=%{_libdir}/tgt
%install
@@ -76,7 +93,7 @@ Currently, software iSCSI targets are supported.
%{__install} -p -m 0600 %{SOURCE5} %{buildroot}%{_sysconfdir}/tgt
pushd usr
-%{__make} install %{?with_rdma:ISCSI_RDMA=1} %{?with_rbd:CEPH_RBD=1} DESTDIR=%{buildroot} sbindir=%{_sbindir} libdir=%{_libdir}/tgt
+%{__make} install %{?with_rdma:ISCSI_RDMA=1} CEPH_RBD=1 DESTDIR=%{buildroot} sbindir=%{_sbindir} libdir=%{_libdir}/tgt
%post
if [ $1 -eq 1 ]; then
@@ -100,8 +117,7 @@ fi
%files
-%defattr(-, root, root, -)
-%doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration doc/README.mmc doc/README.ssc doc/README.rbd
+%doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration doc/README.mmc doc/README.ssc
%{_sbindir}/tgtd
%{_sbindir}/tgtadm
%{_sbindir}/tgt-setup-lun
@@ -115,8 +131,26 @@ fi
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/tgt/tgtd.conf
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/tgt/conf.d/sample.conf
+%files rbd
+%{_libdir}/tgt/backing-store/bs_rbd.so
+%doc doc/README.rbd
+
+%files aio
+%{_libdir}/tgt/backing-store/bs_aio.so
+
%changelog
+* Fri Oct 4 2013 Andy Grover <agrover at redhat.com> - 1.0.40-1
+- New upstream version
+- Break out Ceph (bs_rbd) support into a subpackage
+- Repackage patches based on git
+- Add patches:
+ * fix-no-module-build.patch
+ * usr-Makefile-fix-typo-in-bs_aio-so-filename.patch
+- Fix some weird date issues in changelog
+- Enable aio in a subpackage
+- Remove defattrs from file sections
+
* Tue Sep 3 2013 Andy Grover <agrover at redhat.com> - 1.0.39-1
- New upstream version
- Move with_rbd outside ifnarch, and add comment
@@ -305,10 +339,10 @@ fi
- update to 20071227 snapshot
- add patch to compile with newer glibc
-* Sat Feb 9 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.0-3.20070803snap
+* Sat Feb 9 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.0-3.20070803snap
- rebuild
-* Sun Dec 07 2007 Alex Lancaster <alexlan[AT]fedoraproject.org> - 0.0-2.20070803snap
+* Fri Dec 7 2007 Alex Lancaster <alexlan[AT]fedoraproject.org> - 0.0-2.20070803snap
- rebuild for new openssl soname bump
* Wed Sep 26 2007 Terje Rosten <terje.rosten at ntnu.no> - 0.0-1.20070803snap
diff --git a/sources b/sources
index 9bb74e1..9965b45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cb74af15e9636ff07d420a202d3b19f tgt-1.0.39.tar.gz
+da7dd24c175d9d7dc2f81f51428fcef6 tgt-1.0.40.tar.gz
More information about the scm-commits
mailing list