From 230bb0eadaad062a929fe6b3896a71cb733ab886 Mon Sep 17 00:00:00 2001 From: Matt Thode Date: Thu, 6 Aug 2015 02:15:21 +0000 Subject: major bump, also fixing bugs bug 433820 bug 417501 bug 482830 Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x33ED3FD25AFC78BA --- sys-block/tgt/ChangeLog | 8 ++- sys-block/tgt/Manifest | 39 +++++++------ sys-block/tgt/files/tgtd.confd | 4 ++ sys-block/tgt/files/tgtd.initd | 125 ++++++++++++++++++++++++++++++++++++++++ sys-block/tgt/metadata.xml | 5 ++ sys-block/tgt/tgt-1.0.60.ebuild | 64 ++++++++++++++++++++ 6 files changed, 225 insertions(+), 20 deletions(-) create mode 100644 sys-block/tgt/files/tgtd.confd create mode 100644 sys-block/tgt/files/tgtd.initd create mode 100644 sys-block/tgt/tgt-1.0.60.ebuild (limited to 'sys-block') diff --git a/sys-block/tgt/ChangeLog b/sys-block/tgt/ChangeLog index c2598a075de0..41544a7a31aa 100644 --- a/sys-block/tgt/ChangeLog +++ b/sys-block/tgt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-block/tgt # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/ChangeLog,v 1.21 2015/04/01 22:24:56 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/ChangeLog,v 1.22 2015/08/06 02:15:06 prometheanfire Exp $ + +*tgt-1.0.60 (06 Aug 2015) + + 06 Aug 2015; Matthew Thode +files/tgtd.confd, + +files/tgtd.initd, +tgt-1.0.60.ebuild, metadata.xml: + major bump, also fixing bugs bug 433820 bug 417501 bug 482830 01 Apr 2015; Andreas K. Huettel tgt-1.0.19.ebuild, tgt-1.0.22.ebuild, tgt-1.0.24-r1.ebuild: diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest index b848f064f960..254ce1ef90ef 100644 --- a/sys-block/tgt/Manifest +++ b/sys-block/tgt/Manifest @@ -1,33 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX tgtd 3532 SHA256 a7b64cc3b5d6cd24525ce7939e460ede9860845b2b838e399eab13aa573d5248 SHA512 e1f35c2f619945847108d140a5451a64fba63964217fa9cdd8186b58b3a71da4ce5af3b3d875419344fa20e09e21b4fc95b26c0df6e40a01ab3366151b48348f WHIRLPOOL 248b7680c8bc2f5b8b7c8e045bc3359d702ba5e654a3415fa6f92996f073b2dc7c9d9e9ad4180e079834a1676a4cfed65ea9723cca315836d58ec7f91d4ef097 AUX tgtd-1.0.24.confd 108 SHA256 f1bb9173de8b392116da455fdd45166f9088c7740867ac1778fe161beebfad3e SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91 WHIRLPOOL d1868d82c473b4790c506e6bc8b1ee03adf6779b4d848bbb7c406be59f0b30c4942be13057f93a112e784281937fc0e50f40ecffe0f71b641e407d1333000ca7 AUX tgtd-1.0.24.initd 3566 SHA256 67859625186f14f68c692ef2cf94848ea64e8bf9c1acc22c38ccf8409b69c9ed SHA512 087bc2ebf8de6dbb22fafb0363cb700b29872ee41af88ce04f09b92a4ea87f5dd2e820d184bda5fd1e07f41d7839f7b2d6c420951a51a598477096189a502a22 WHIRLPOOL 2f491e944f91b675ede5c3a5382e79b7f0e0bf2cb85ea836536a63d122a69c304a008fec10929eb68181819aadd8aea5b53a6b20659db8b5aced4d8b8332b965 +AUX tgtd.confd 108 SHA256 f1bb9173de8b392116da455fdd45166f9088c7740867ac1778fe161beebfad3e SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91 WHIRLPOOL d1868d82c473b4790c506e6bc8b1ee03adf6779b4d848bbb7c406be59f0b30c4942be13057f93a112e784281937fc0e50f40ecffe0f71b641e407d1333000ca7 +AUX tgtd.initd 3529 SHA256 6193c8f018b7c10402d62c80e6791839e2f3f703ae0ca7bfd0755ce07b5e61f5 SHA512 ff04306eda8917c902928016f95afa4735547480ebc470594fe0341781f449324967f856181739e9a5bf6a0d8aef2fa25d775e4ca7663f194f1344cf690eac1c WHIRLPOOL 65b99425a543fd7469bb3b1ebf8f1c66c917debc1048eaeb24f14a8fffdd644e1f7b94ad062c893c5b4fe0faa212054330325e07d3cfa3b51e925227e567ccc1 DIST tgt-1.0.19.tar.gz 241676 SHA256 69fd9e9528a70c272bcc3cd00ad6754edd819a0a1ce0fad21587d33c457c6f68 DIST tgt-1.0.22.tar.gz 227522 SHA256 a23e97d9e1bd2b5f0be06c7f441f70b8fcc98ebf1ce61b57d0e81f60c1cbcc06 DIST tgt-1.0.24.tar.gz 231583 SHA256 43758d81345c176774c9ec3b823295c6b090ab60406cd47c7a636d77af4362bc +DIST tgt-1.0.60.tar.gz 295304 SHA256 619b5250e4bc63971a26c05a3eea353beb4009ed0ffa06aab5f8ee25346cfb0a SHA512 4abca297e89dd92d1d1480f26af39a80f1cb7cd67e54911f4bdf29db8531b1df51fe214af05e685270e439bf702d4805542773c29baecc7a94ef271b2a0b97fb WHIRLPOOL 26119b14f741f6094fc816f48a58f1694b47505e7a0963e10e2efdffd49782886735c9b2463850d7ad03c149293f4b31512ee1b994607a5bbd30f0cee56f68fd EBUILD tgt-1.0.19.ebuild 1277 SHA256 252a906a117171b076b6fc034def605e8ba45abed069c0f7d0febb24dd50b738 SHA512 e8124fb74bfca8453922988d0a89a60ea9853963e18717b9b9fddce49fb284bb316eb5834403814df24ff9d8223edaff4e941f811d636ac2d0687f7034a5bccb WHIRLPOOL f0c9bc36b223d3fc429b30b3f58867d264c75a077ede86207e1ef958e5901ddf31f11957e39a615ca28a4a66b261bfac771c0d88c4ec52de2022091cc3ab8ce0 EBUILD tgt-1.0.22.ebuild 1505 SHA256 0482adebb815e3f1a1c57575c4fe85b278576012f779a0c0ac48afd7e70dd982 SHA512 c9a25fe10307eb662f8a3ff74cb953efbc8247277cc750211e9d1b7e0595cba46067a6d9475a3e793c3057dd38f6195255a2f45caa07719ee745e3cdbbe42999 WHIRLPOOL 633eaa4fea93c3cf9ddf9ddaba3b3b092d40d2f1d68a477006e07de3c70d0ebf11ecc10ac1cd5ad3c165ca90d13eb98cd218876ad89b28e7b36af13e21fb2b1a EBUILD tgt-1.0.24-r1.ebuild 1653 SHA256 75b83be5e088639c5d6e81b54dcc080ba03c6c039e3cca66c0f07b55bd399685 SHA512 0f79a4cc61f019c0943d1c7b24b1e0965ef571929dfcdcf25b42d62c577f833993f473daeb33aa5ef6f75b5364c6f7111d526ff7096b05e904a441df5c0945c9 WHIRLPOOL 8e0d8b24540d4f1b933253b067318b4ee5c5bffed56345205edd4d259735e0b1ec2da10e1a08169b765bee6f2d5c918e010d6f2051c2c87a54340c22fcefbcb3 -MISC ChangeLog 3393 SHA256 6ac06e443a8182bf24847ba9bf3b2c796a4304733ea2f7472aeda84cddded4af SHA512 a2c9d52af86e48c2e403e3997580521f53b413a00ebb8fbf6e3ec77b69cdda12fa7c1952f3612dabfef73bd6d3f66117156d246be2e661aa81b884690c653629 WHIRLPOOL 34bb11700aee014429c66d41ba13c31981970aafaa48d57e277313412f7ef11d7a7085248468c86a57e92028d0bce47c3392bc205040eb3dda252d34d4b165b9 -MISC metadata.xml 503 SHA256 69ae8442c13c925901cb9152876ac58b692d59bd2c43aace727f700dd2b26b3d SHA512 462c17411c41df02788fbcdae40563c71bf48fc64dfb054d9b63fa3ea809b98063ae2c94a2a463fe9602e0d96249eeb33383fc11db9b698c92d4676c24281c62 WHIRLPOOL fcae761d5edbfd51b6bd173f08914024955377bb7393e58057a936c0bfbb83c5fb315e19d113b83e12e5c77de2db0d1ef893e2cb49769fbd9b86e9cd99c163d0 +EBUILD tgt-1.0.60.ebuild 1620 SHA256 4b3f272f3451a5333f7de6bda2913a8ba9cd5f8adf4d8f254ee9542a1b110f85 SHA512 359e14a12eab13398f56c7336572927315ec59ebec9df5e85790e92b5f9915c3b7b5a226270dafa194a544da8ce551c57d9f372a6e38adf601d17154a9d13c6c WHIRLPOOL 5e61da60dee3d4a4ccd4c0e303de564dbecf0011b47eea68f5f51b7dcbee71d17b907dc6fa7f14c65eaadee6aeed243968f34fc069c2200c9b0095b7e73e9001 +MISC ChangeLog 3622 SHA256 65a73b0bd668a11fa58deebfe049a8736e5359a72d408fd66581c543a6b58d92 SHA512 71ebf6d048a5cb4cc7b8849987a0785530206ce3c823f1f4821dee09fb20486c6bf5f30cbc19da49eb2343455d1a18459b886b63a3cd47946dc0042109b5edba WHIRLPOOL a42dcc981f29d1215ad1ba05f20bae3b44c8c3af2fd76ac2784839b9ec6c8c1e98a0302fcbb489912c2ad905e5d9dee11575137966365128fc8a53093711fc6e +MISC metadata.xml 665 SHA256 5d27a139c7e3efe36e346bfa3713fa17b1a9c6fcfa6fd1b033392878d5457192 SHA512 54bba0cd45448c511b0b8bfeecc9bfea05fc71f542314c507355057810bd2725af58601a4df8f55fc17d908c5e9c5013164b03bc934a4046e2723955d5a6bbb8 WHIRLPOOL dcfecfce607ec2293bfb126e162b8611019095f6a6a275a40e00ea908e88d8ae1cbe982d6c4acedc81f13fbbbeda934d1ebe6b5f95e93cfbed6b7e8fb377619a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJVfyc/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF -OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBfUP/0jv/DsuepJMYl2dU/Hq/BVc -Q1l2k/39IhhCZY4Gn92BBikQyaJcumXl89pv3crIt3iM+t8zDj62Vf/GBLV29M8W -0g6fT96KO3cf4asO42nNUryfUxGzhhTpcmTjKU4XDiNYtd1u6YxWLZJhDq7stZGd -qdv81aVfcGj6L90n0WmYds3plEjVMkeOlg55iCFavJpKu7HuqZTF+mJTzgVrrQuG -otKE5khrVfnPtKkUXeIA+xxmrZs7KOF/Calp4Fv/x1mRCovDkLKjDHVPuEtGeAGW -E/v2DsmPyyMA/bpjuUgxAEzyDgIhqP4ijmUfDvjZLTOWTJyCuBepY6wVPB0cSg0A -QH6ACehRIaEMrORYv3tIyiDHS9rgIUCVdfvXFLLumGm1I1KFAQMCCA+QU4a21nCu -AMhtj/Zx3ZlZgq+bNxQVY4QXL/y0sYWl2kBBHNF6eiLF+CRVcIleuVwTR1I/9djQ -OnPWM4DFncIfh6f5UCKx1WHDj4ioHq3ovHh22Dw+q8rijI4bsRY+NFJLYxQth568 -zxeoQXotAOSvcCsQrps3fHvpBS/mIuVvqkk1WTxN8p2Qq8jpjqZ+y6ro7m7C8fmi -n94phMRJs0DDlOVcVl6oIQgNAaPh0HYYnqPl4LuByYQMCjwujVx3+qkxeW6CXhvj -S+vBqOn6AZtBsugMs2y1 -=R2oY +iQIcBAEBCAAGBQJVwsN2AAoJEGSje+quGaTooBoP/R4Wvp2haByBZQNsNdypNtFA ++vflNwp2kJFcCwUjvteTd+P5Ev6XeyCS6GfJ1TByVsjd3zDwNUr2O4ytUoSpqsB3 +X8Zr6LfGv2fvGJ7LvTTv1rYZIYnwUxUAjaa2GpGZwcclLuAOCEE9i+ZnhDXQK1Yj +D0HWav7Gm1NJoLmFYvVURtPhuTGIa8mtdqLIhK8J5FnAGtwYP+TAIU/4XqJ7kDGx +7F2WCsHIXJVd3JaeLfs4C8CFOWw0b0nzN5yxJws4jCSnjHc2zEyrKjM5iGoygQU/ +cClYHV/jBsEFDT7RIbrpubCpR9iAaazgZCHACAtcv4dUIuBlcvtZLT9CmgmBKcxJ +AZBEYHVSU7Yzic94GnkfTB09Bu3npuZWm3sJs3VJZLFe6hMfdphpybIW3shitmvJ +thicIpsLPAuM5BrJ4/+IVd2SwKrXaYYoLdEAhi+oSj9Wym5ic39mfmZZj+fhuXEA +DFji2/vwk1jQ7i5pkkEhI3VBhsaIrQAJxhVkx5Ml5emppDC9CgLGeGKmvmNKzq6Y +rsz2B4Y8Yh5XNY6jYEg1wzCDtQuioeyMp8Ywi7FQSm3APF7Wu8TYbOGKnnN/rljv +IkoU7RTt809T5A0RgFmvGsDbsfOLpqpi4UwNLzCFAWAhiZNFOVAfzLBIFngoIdlk +6ecevDof2vqIBVw7cTA6 +=pwZh -----END PGP SIGNATURE----- diff --git a/sys-block/tgt/files/tgtd.confd b/sys-block/tgt/files/tgtd.confd new file mode 100644 index 000000000000..fd4c098eaef2 --- /dev/null +++ b/sys-block/tgt/files/tgtd.confd @@ -0,0 +1,4 @@ +# Here you can specify options that are passed directly to tgt daemon +TGTD_OPTS="" + +# vim: ft=gentoo-conf-d diff --git a/sys-block/tgt/files/tgtd.initd b/sys-block/tgt/files/tgtd.initd new file mode 100644 index 000000000000..dfc469ba2ce6 --- /dev/null +++ b/sys-block/tgt/files/tgtd.initd @@ -0,0 +1,125 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/files/tgtd.initd,v 1.1 2015/08/06 02:15:06 prometheanfire Exp $ + +TGTD_CONFIG=/etc/tgt/targets.conf + +TASK=$1 + +depend() { + need net +} + +start() { + ebegin "Starting target framework daemon" + ebegin "Starting ${SVCNAME}" + # Start tgtd first. + start-stop-daemon --start --quiet \ + --name tgtd \ + --exec /usr/sbin/tgtd -- \ + ${TGTD_OPTS} + RETVAL=$? + if [ "$RETVAL" -ne 0 ] ; then + echo "Could not start tgtd (is tgtd already running?)" + exit 1 + fi + # We need to wait for 1 second before do anything with tgtd + sleep 1 + # Put tgtd into "offline" state until all the targets are configured. + # We don't want initiators to (re)connect and fail the connection + # if it's not ready + tgtadm --op update --mode sys --name State -v offline + # Configure the targets. + tgt-admin --update ALL -c $TGTD_CONFIG + # Put tgtd into "ready" state. + tgtadm --op update --mode sys --name State -v ready + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + ebegin "Stopping target framework daemon" + # start-stop-daemon --stop --exec /usr/sbin/tgtd --quiet + if [ "$RUNLEVEL" == 0 -o "$RUNLEVEL" == 6 ] ; then + forcedstop + fi + # Remove all targets. It only removes targets which are not in use. + tgt-admin --update ALL -c /dev/null &>/dev/null + # tgtd will exit if all targets were removed + tgtadm --op delete --mode system &>/dev/null + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + echo "tgtd is not running" + if [ "$TASK" != "restart" ] ; then + exit 1 + fi + elif [ "$RETVAL" -ne 0 ] ; then + echo "Some initiators are still connected - could not stop tgtd" + exit 2 + fi + # echo -n + eend $? +} + +forcedstop() { + # NOTE: Forced shutdown of the iscsi target may cause data corruption + # for initiators that are connected. + echo "Force-stopping target framework daemon" + # Offline everything first. May be needed if we're rebooting, but + # expect the initiators to reconnect cleanly when we boot again + # (i.e. we don't want them to reconnect to a tgtd which is still + # working, but the target is gone). + tgtadm --op update --mode sys --name State -v offline &>/dev/null + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + echo "tgtd is not running" + if [ "$TASK" != "restart" ] ; then + exit 1 + fi + else + tgt-admin --offline ALL + # Remove all targets, even if they are still in use. + tgt-admin --update ALL -c /dev/null -f + # It will shut down tgtd only after all targets were removed. + tgtadm --op delete --mode system + RETVAL=$? + if [ "$RETVAL" -ne 0 ] ; then + echo "Failed to shutdown tgtd" + exit 1 + fi + fi + echo -n +} + +reload() { + echo "Updating target framework daemon configuration" + # Update configuration for targets. Only targets which + # are not in use will be updated. + tgt-admin --update ALL -c $TGTD_CONFIG &>/dev/null + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + echo "tgtd is not running" + exit 1 + fi +} + +forcedreload() { + echo "Force-updating target framework daemon configuration" + # Update configuration for targets, even those in use. + tgt-admin --update ALL -f -c $TGTD_CONFIG &>/dev/null + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + echo "tgtd is not running" + exit 1 + fi +} + +status() { + TGTD_PROC=$(pidof -c -o $$ -o %PPID tgtd) + if [ -n "$TGTD_PROC" ] ; then + echo "tgtd is running. Run 'tgt-admin -s' to see detailed target info." + else + echo "tgtd is NOT running." + fi +} diff --git a/sys-block/tgt/metadata.xml b/sys-block/tgt/metadata.xml index edb8de50354a..a8b121f2ed61 100644 --- a/sys-block/tgt/metadata.xml +++ b/sys-block/tgt/metadata.xml @@ -2,6 +2,10 @@ cluster + + prometheanfire@gentoo.org + Matthew Thode + iSCSI Target daemon with rdma support @@ -9,6 +13,7 @@ iSCSI Target daemon with rdma support Add support for IBM Virtual I/O Add support for new FC protocol Add support for FCoE protocol + Add support for ceph block devices fujita/tgt diff --git a/sys-block/tgt/tgt-1.0.60.ebuild b/sys-block/tgt/tgt-1.0.60.ebuild new file mode 100644 index 000000000000..99a5383504ef --- /dev/null +++ b/sys-block/tgt/tgt-1.0.60.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/tgt-1.0.60.ebuild,v 1.1 2015/08/06 02:15:06 prometheanfire Exp $ + +EAPI=5 + +inherit flag-o-matic toolchain-funcs + +MY_TREE="ab51727" + +DESCRIPTION="Linux SCSI target framework (tgt)" +HOMEPAGE="http://stgt.sourceforge.net" +SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="fcoe fcp ibmvio infiniband rbd" + +CDEPEND="dev-perl/Config-General + dev-libs/libxslt + rbd? ( sys-cluster/ceph ) + infiniband? ( + sys-infiniband/libibverbs:= + sys-infiniband/librdmacm:= + )" +DEPEND="${CDEPEND} + app-text/docbook-xsl-stylesheets" +RDEPEND="${DEPEND} + dev-libs/libaio + sys-apps/sg3_utils" + +S=${WORKDIR}/fujita-tgt-${MY_TREE} + +pkg_setup() { + tc-export CC +} + +src_prepare() { + sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die + + # make sure xml docs are generated before trying to install them + sed -i -e "s@install: @& all @g" doc/Makefile || die +} + +src_compile() { + local myconf + use ibmvio && myconf="${myconf} IBMVIO=1" + use infiniband && myconf="${myconf} ISCSI_RDMA=1" + use fcp && myconf="${myconf} FCP=1" + use fcoe && myconf="${myconf} FCOE=1" + use rbd && myconf="${myconf} CEPH_RBD=1" + + emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf} + emake -C doc +} + +src_install() { + emake install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF} + newinitd "${FILESDIR}"/tgtd.initd tgtd + newconfd "${FILESDIR}"/tgtd.confd tgtd + dodir /etc/tgt + keepdir /etc/tgt +} -- cgit v1.2.3-65-gdbad