From 9ec2033a639fa5f80cb24896485fabe55f0bd1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakov=20Smoli=C4=87?= Date: Fri, 14 Jan 2022 13:54:53 +0100 Subject: sys-block/tgt: Switch to rdma-core for infiniband support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/831004 Signed-off-by: Jakov Smolić --- sys-block/tgt/tgt-1.0.79-r1.ebuild | 63 ++++++++++++++++++++++++++++++++++++ sys-block/tgt/tgt-1.0.79.ebuild | 65 -------------------------------------- sys-block/tgt/tgt-1.0.80-r1.ebuild | 58 ++++++++++++++++++++++++++++++++++ sys-block/tgt/tgt-1.0.80.ebuild | 60 ----------------------------------- 4 files changed, 121 insertions(+), 125 deletions(-) create mode 100644 sys-block/tgt/tgt-1.0.79-r1.ebuild delete mode 100644 sys-block/tgt/tgt-1.0.79.ebuild create mode 100644 sys-block/tgt/tgt-1.0.80-r1.ebuild delete mode 100644 sys-block/tgt/tgt-1.0.80.ebuild diff --git a/sys-block/tgt/tgt-1.0.79-r1.ebuild b/sys-block/tgt/tgt-1.0.79-r1.ebuild new file mode 100644 index 000000000000..6f0228a31bb9 --- /dev/null +++ b/sys-block/tgt/tgt-1.0.79-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +MY_TREE="b43dbc6" + +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 arm64 ~ppc x86" +IUSE="fcoe fcp ibmvio infiniband rbd" + +DEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-perl/Config-General + rbd? ( sys-cluster/ceph ) + infiniband? ( sys-cluster/rdma-core ) +" +RDEPEND="${DEPEND} + dev-libs/libaio + sys-apps/sg3_utils" + +S=${WORKDIR}/fujita-tgt-${MY_TREE} + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + +pkg_setup() { + tc-export CC +} + +src_prepare() { + default + 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 + sed -i -e 's|-Werror||g' usr/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 +} diff --git a/sys-block/tgt/tgt-1.0.79.ebuild b/sys-block/tgt/tgt-1.0.79.ebuild deleted file mode 100644 index 961f8dd234c7..000000000000 --- a/sys-block/tgt/tgt-1.0.79.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -MY_TREE="b43dbc6" - -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 arm64 ~ppc x86" -IUSE="fcoe fcp ibmvio infiniband rbd" - -DEPEND=" - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-perl/Config-General - rbd? ( sys-cluster/ceph ) - infiniband? ( - sys-fabric/libibverbs:= - sys-fabric/librdmacm:= - )" -RDEPEND="${DEPEND} - dev-libs/libaio - sys-apps/sg3_utils" - -S=${WORKDIR}/fujita-tgt-${MY_TREE} - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -pkg_setup() { - tc-export CC -} - -src_prepare() { - default - 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 - sed -i -e 's|-Werror||g' usr/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 -} diff --git a/sys-block/tgt/tgt-1.0.80-r1.ebuild b/sys-block/tgt/tgt-1.0.80-r1.ebuild new file mode 100644 index 000000000000..bec1b9856298 --- /dev/null +++ b/sys-block/tgt/tgt-1.0.80-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs systemd + +DESCRIPTION="Linux SCSI target framework (tgt)" +HOMEPAGE="http://stgt.sourceforge.net" +SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86" +IUSE="fcoe fcp ibmvio infiniband rbd" + +DEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-perl/Config-General + rbd? ( sys-cluster/ceph ) + infiniband? ( sys-cluster/rdma-core ) +" +RDEPEND="${DEPEND} + dev-libs/libaio + sys-apps/sg3_utils" + +pkg_setup() { + tc-export CC +} + +src_prepare() { + default + 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 + sed -i -e 's|-Werror||g' usr/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 + systemd_dounit "${S}"/scripts/tgtd.service + dodir /etc/tgt + keepdir /etc/tgt +} diff --git a/sys-block/tgt/tgt-1.0.80.ebuild b/sys-block/tgt/tgt-1.0.80.ebuild deleted file mode 100644 index 6b69bccd3612..000000000000 --- a/sys-block/tgt/tgt-1.0.80.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs systemd - -DESCRIPTION="Linux SCSI target framework (tgt)" -HOMEPAGE="http://stgt.sourceforge.net" -SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86" -IUSE="fcoe fcp ibmvio infiniband rbd" - -DEPEND=" - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-perl/Config-General - rbd? ( sys-cluster/ceph ) - infiniband? ( - sys-fabric/libibverbs:= - sys-fabric/librdmacm:= - )" -RDEPEND="${DEPEND} - dev-libs/libaio - sys-apps/sg3_utils" - -pkg_setup() { - tc-export CC -} - -src_prepare() { - default - 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 - sed -i -e 's|-Werror||g' usr/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 - systemd_dounit "${S}"/scripts/tgtd.service - dodir /etc/tgt - keepdir /etc/tgt -} -- cgit v1.2.3