From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QVAjr-0006P1-TY for garchives@archives.gentoo.org; Fri, 10 Jun 2011 23:03:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D046A1C076; Fri, 10 Jun 2011 23:02:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7A02F1C076 for ; Fri, 10 Jun 2011 23:02:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3FAA2AC00F for ; Fri, 10 Jun 2011 23:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A5C1380048 for ; Fri, 10 Jun 2011 23:02:14 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: Subject: [gentoo-commits] proj/anaconda-overlay:master commit in: sys-block/open-iscsi/ X-VCS-Repository: proj/anaconda-overlay X-VCS-Files: sys-block/open-iscsi/Manifest sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild sys-block/open-iscsi/open-iscsi-2.0.872.ebuild X-VCS-Directories: sys-block/open-iscsi/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: d3cc0bf1d3c8157dfd06c22a09bfca2396f66526 Date: Fri, 10 Jun 2011 23:02:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 86e8aab7c13c3702fa42595a08ada7b2 commit: d3cc0bf1d3c8157dfd06c22a09bfca2396f66526 Author: wiktor w brodlo brodlo net> AuthorDate: Fri Jun 10 13:34:17 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Fri Jun 10 13:34:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda-over= lay.git;a=3Dcommit;h=3Dd3cc0bf1 sys-block/open-iscsi version bump --- sys-block/open-iscsi/Manifest | 2 - .../open-iscsi/open-iscsi-2.0.870.3-r1.ebuild | 156 --------------= ------ sys-block/open-iscsi/open-iscsi-2.0.872.ebuild | 106 +++++++++++++ 3 files changed, 106 insertions(+), 158 deletions(-) diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifes= t index 7c35b52..2703bb6 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -30,8 +30,6 @@ AUX redhat/open-iscsi-2.0-870.1-compile-fix.patch 418 R= MD160 92801d821280cee8d5c AUX redhat/open-iscsi-2.0-870.1-fwparam-ppc-crash.patch 1715 RMD160 587f= e8033621d52f5540c9ffc720e92c0b63991f SHA1 b693de1cd9fc16cd075d52932baa843= f70f9601c SHA256 9d9aed1554bf1babad3c265ff4c2f2de7ba199e33d6861b4abc306b2= ae726d79 AUX redhat/open-iscsi-2.0-870.1-ibft-newer-kernel.patch 1144 RMD160 88c2= b9c95e6e49ab9cb9c49077e1ac4e72ab95ee SHA1 6f2a0ed60057f6baf419ddfec1b8e2c= df202acc2 SHA256 8b1043783be68afaf3fa01364e900b1b0ec94685ea5531d7128ee442= 654bfefb AUX redhat/open-iscsi-2.0-870.1-no-exit.patch 4985 RMD160 318d9c4bec7d2d= cbcf8f589017f55f8eeb2dc8fc SHA1 0d2c37af9e617605532f11653342fefc03031e07 = SHA256 375480ce5096219b92ab9cc4afaeaa2595bd3098fc8a3fb3bbae3afc7df492e1 -DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6= d88511026605b13 SHA1 bc8253558b1a6b0c12ec0fbb0f01d6cb56d39395 SHA256 8ca6= 708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec DIST open-iscsi-2.0-872.tar.gz 900081 RMD160 4eacb8a94cf7712f936b52a961f= a7f11774dde67 SHA1 96880185791177ba7b8970742572b46ebfe901cd SHA256 377536= 97a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f -EBUILD open-iscsi-2.0.870.3-r1.ebuild 4604 RMD160 41c343917ccb9f069d1f22= f6c5bc30f269a21882 SHA1 17437ce23c91110ae9558aa23947d74cacbe2908 SHA256 b= 6a4612123c3c985de91f81d696ba2b4a658eb43854b2b83f33169493b83b3bf EBUILD open-iscsi-2.0.872.ebuild 3082 RMD160 9508e1ee3d856da8d7161937de8= 5378cf4136ce9 SHA1 cdef0676a35119b4316b4972a73e6b0430eabcf7 SHA256 9c5666= bf03cd0ff2bdb348b177b222469546751c222630d44a7785711be1d6cb MISC metadata.xml 366 RMD160 e6901bcc9954fa2e7ebdc201be3f117f2769d11e SH= A1 2f12a23a3bd4a33409183a32a99708dc4ce236e4 SHA256 023a201ecaa94699b40215= 6f02c08c416e6eed0584f2096152605f3bef5df31a diff --git a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild b/sys-bl= ock/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild deleted file mode 100644 index 58c35b2..0000000 --- a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.8= 70.3-r1.ebuild,v 1.1 2009/10/27 19:47:34 dertobi123 Exp $ - -inherit distutils versionator linux-mod eutils flag-o-matic - -DESCRIPTION=3D"Open-iSCSI is a high performance, transport independent, = multi-platform implementation of RFC3720" -HOMEPAGE=3D"http://www.open-iscsi.org/" -MY_PV=3D"${PN}-$(replace_version_separator 2 "-" $MY_PV)" -SRC_URI=3D"http://www.open-iscsi.org/bits/${MY_PV}.tar.gz" -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~x86 ~amd64 ~ppc ~mips" -IUSE=3D"modules utils debug" -DEPEND=3D"virtual/linux-sources app-doc/doxygen" -RDEPEND=3D"virtual/modutils sys-apps/util-linux" - -S=3D"${WORKDIR}/${MY_PV}" - -MODULE_NAMES_ARG=3D"kernel/drivers/scsi:${S}/kernel" -MODULE_NAMES=3D"iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MO= DULE_NAMES_ARG}) libiscsi(${MODULE_NAMES_ARG})" -BUILD_TARGETS=3D"all" -CONFIG_CHECK=3D"CRYPTO_CRC32C" -ERROR_CFG=3D"open-iscsi needs CRC32C support in your kernel." - -src_unpack() { - unpack ${A} - export EPATCH_OPTS=3D"-d${S}" - if [ $KV_PATCH -lt 15 ]; then - die "Sorry, your kernel must be 2.6.16-rc5 or newer!" - fi - epatch "${FILESDIR}"/CVE-2009-1297.patch - - # add RH patches, we need libiscsi for anaconda - epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-update-initscripts-an= d-docs.patch - epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-use-var-for-config.pa= tch - epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-use-red-hat-for-name.= patch - epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-ibft-sysfs.patch - epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-print-ibft-net-info.p= atch - epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-only-root-use.patch - epatch "${FILESDIR}"/redhat/iscsi-initiator-utils-start-iscsid.patch - - epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-add-libiscsi.patch - epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-no-exit.patch - epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-ibft-newer-kernel.patch - epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-485217.patch - epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-fwparam-ppc-crash.patch - epatch "${FILESDIR}"/redhat/${PN}-2.0-870.1-compile-fix.patch - - # >=3D2.6.36 kernel support - epatch "${FILESDIR}"/${PN}-2.0.870-null-sysfs-str.patch - -} - -src_compile() { - use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI - - if use modules; then - einfo "Building kernel modules" - export KSRC=3D"${KERNEL_DIR}" - linux-mod_src_compile || die "failed to build modules" - fi - - einfo "Building fwparam_ibft" - cd "${S}"/utils/fwparam_ibft && \ - CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" \ - || die "emake failed" - - einfo "Building userspace" - cd "${S}"/usr && \ - CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" \ - || die "emake failed" - - einfo "Building libiscsi" - cd "${S}"/libiscsi && \ - CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" \ - || die "emake failed" - cd "${S}/libiscsi" && \ - distutils_src_compile - - if use utils; then - einfo "Building utils" - cd "${S}"/utils && \ - CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" \ - || die "emake failed" - fi -} - -src_install() { - if use modules; then - einfo "Installing kernel modules" - export KSRC=3D"${KERNEL_DIR}" - linux-mod_src_install - fi - - einfo "Installing userspace" - dosbin usr/iscsid usr/iscsiadm usr/iscsistart - - einfo "Installing libiscsi" - dodir /usr/$(get_libdir) - exeinto /usr/$(get_libdir) - doexe "${S}"/libiscsi/libiscsi.so.0 - dosym /usr/$(get_libdir)/libiscsi.so.0 /usr/$(get_libdir)/libiscsi.so - - dodir /usr/include - insinto /usr/include - doins "${S}"/libiscsi/libiscsi.h - - cd "${S}/libiscsi" - distutils_src_install - cd "${S}" - - if use utils; then - einfo "Installing utilities" - dosbin utils/iscsi-iname utils/iscsi_discovery - fi - - einfo "Installing docs" - doman doc/*[1-8] - dodoc README THANKS - docinto test - dodoc test/* - - einfo "Installing configuration" - insinto /etc/iscsi - doins etc/iscsid.conf - - # only contains iscsi initiatorname, no need to update - if [ ! -e /etc/iscsi/initiatorname.iscsi ]; then - doins "${FILESDIR}"/initiatorname.iscsi - fi - - # if there is a special conf.d for this version, use it - # otherwise, use the default: iscsid-conf.d - insinto /etc/conf.d - if [ -e "${FILESDIR}"/iscsid-${PV}.conf.d ]; then - newins "${FILESDIR}"/iscsid-${PV}.conf.d iscsid - else - newins "${FILESDIR}"/iscsid-conf.d iscsid - fi - - # same for init.d - if [ -e "${FILESDIR}"/iscsid-${PV}.init.d ]; then - newinitd "${FILESDIR}"/iscsid-${PV}.init.d iscsid - else - newinitd "${FILESDIR}"/iscsid-init.d iscsid - fi - - keepdir /var/db/iscsi - fperms 700 /var/db/iscsi - fperms 600 /etc/iscsi/iscsid.conf -} - -pkg_postinst() { - linux-mod_pkg_postinst -} diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/o= pen-iscsi/open-iscsi-2.0.872.ebuild new file mode 100644 index 0000000..2ecc799 --- /dev/null +++ b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D3 +inherit distutils versionator linux-info eutils flag-o-matic autotools + +DESCRIPTION=3D"Open-iSCSI is a high performance, transport independent, = multi-platform implementation of RFC3720" +HOMEPAGE=3D"http://www.open-iscsi.org/" +MY_PV=3D"${PN}-$(replace_version_separator 2 "-" $MY_PV)" +SRC_URI=3D"mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/$= {MY_PV}.tar.gz" +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"debug slp" +DEPEND=3D"net-libs/openslp" +RDEPEND=3D"${DEPEND} + sys-apps/util-linux" + +S=3D"${WORKDIR}/${MY_PV}" + +pkg_setup() { + linux-info_pkg_setup + + if [ $KV_PATCH -lt 15 ]; then + die "Sorry, your kernel must be 2.6.16-rc5 or newer!" + fi +} + +src_prepare() { + export EPATCH_OPTS=3D"-d${S}" + epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch + epatch "${FILESDIR}"/${P}-glibc212.patch + epatch "${FILESDIR}"/${P}-slp.patch + epatch "${FILESDIR}"/${P}-omg-calling-configure.patch + + # add RH patches, we need libiscsi for anaconda + epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-update-initscri= pts-and-docs.patch + epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-use-var-for-con= fig.patch + epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-use-red-hat-for= -name.patch + epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-add-libiscsi.pa= tch + epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-disable-isns-fo= r-lib.patch + epatch "${FILESDIR}"/redhat-${PV}/iscsi-initiator-utils-fix-lib-sysfs-i= nit.patch + + if use slp; then + # workaround bug with lslp + cd "${S}"/utils/open-isns || die + eautoreconf + sed -i "s:-lisns:-lisns -lslp:g" "${S}"/usr/Makefile || die + fi +} + +src_configure() { + einfo "Configuring userpsace" + cd "${S}/utils/open-isns" || die + econf $(use_with slp) || die +} + +src_compile() { + use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI + einfo "Building userspace" + cd "${S}" || die + CFLAGS=3D"" emake OPTFLAGS=3D"${CFLAGS}" user || die "emake failed" +} + +src_install() { + # build system is broken... + emake DESTDIR=3D"${D}" sbindir=3D"/usr/sbin" install_user || die "emake= install_user failed" + # this doesn't get installed + dosbin usr/iscsistart + + einfo "Installing configuration" + insinto /etc/iscsi + doins etc/iscsid.conf + newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example + insinto /etc/iscsi/ifaces + doins etc/iface.example + + newconfd "${FILESDIR}"/iscsid-conf.d iscsid + newinitd "${FILESDIR}"/iscsid-2.0.871-r1.init.d iscsid + + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi + fperms 600 /etc/iscsi/iscsid.conf + + einfo "Installing libiscsi" + dodir /usr/$(get_libdir) + exeinto /usr/$(get_libdir) + doexe "${S}"/libiscsi/libiscsi.so.0 + dosym libiscsi.so.0 /usr/$(get_libdir)/libiscsi.so + + dodir /usr/include + insinto /usr/include + doins "${S}"/libiscsi/libiscsi.h + + cd "${S}"/libiscsi || die + distutils_src_install + +} + +pkg_postinst() { + in=3D'/etc/iscsi/initiatorname.iscsi' + if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then + cp -f "${ROOT}${in}.example" "${ROOT}${in}" + fi +}