diff options
| author |   Richard Yao <ryao@gentoo.org> | 2013-08-21 14:29:48 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2013-08-21 14:29:48 +0000 |
| commit | 35efbf173fdd19575e19ce854218da7b93449f63 (patch) | |
| tree | 208b19282c30f8b2a64b90caa07e918286598d83 /sys-block/iscsitarget | |
| parent | Do not build tests as it needs to be done in other phase function and additio... (diff) | |
| download | gentoo-2-35efbf173fdd19575e19ce854218da7b93449f63.tar.gz gentoo-2-35efbf173fdd19575e19ce854218da7b93449f63.tar.bz2 gentoo-2-35efbf173fdd19575e19ce854218da7b93449f63.zip | |
Fix ESVN_REPO_URI in 9999 ebuild; Apply upstream kernel patches on 9999 ebuild; Use epatch_user on 9999 ebuild; Merge back changes from 9999 build to iscsitarget-1.4.20.2_p20130103
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
Diffstat (limited to 'sys-block/iscsitarget')
| -rw-r--r-- | sys-block/iscsitarget/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild | 12 | ||||
| -rw-r--r-- | sys-block/iscsitarget/iscsitarget-9999.ebuild | 12 |
3 files changed, 21 insertions, 11 deletions
diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog index 8ecb7e1b7b8a..64ecbfc7e135 100644 --- a/sys-block/iscsitarget/ChangeLog +++ b/sys-block/iscsitarget/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-block/iscsitarget # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.42 2013/01/07 20:54:52 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.43 2013/08/21 14:29:48 ryao Exp $ + + 21 Aug 2013; Richard Yao <ryao@gentoo.org> + iscsitarget-1.4.20.2_p20130103.ebuild, iscsitarget-9999.ebuild: + Fix ESVN_REPO_URI in 9999 ebuild; Apply upstream kernel patches on 9999 + ebuild; Use epatch_user on 9999 ebuild; Merge back changes from 9999 build to + iscsitarget-1.4.20.2_p20130103 07 Jan 2013; Richard Yao <ryao@gentoo.org> +files/iscsitarget-1.4.20.2-respect-flags-v2.patch, diff --git a/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild index 7cd97fc35cdc..d923682a844f 100644 --- a/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild +++ b/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild,v 1.1 2013/01/03 11:09:58 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild,v 1.2 2013/08/21 14:29:48 ryao Exp $ EAPI="4" @@ -8,7 +8,7 @@ inherit linux-mod eutils flag-o-matic if [ ${PV} == "9999" ] ; then inherit subversion - ESVN_REPO_URI="http://iscsitarget.svn.sourceforge.net/svnroot/iscsitarget/trunk" + ESVN_REPO_URI="http://svn.code.sf.net/p/iscsitarget/code/trunk" else SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.gz" KEYWORDS="~amd64 ~ppc ~x86" @@ -43,15 +43,17 @@ src_prepare() { # Fix build system to apply proper patches epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-fix-3.2-support.patch" - # Apply kernel-specific patches - emake KSRC="${KERNEL_DIR}" patch || die - # Respect LDFLAGS. Bug #365735 epatch "${FILESDIR}/${PN}-1.4.20.2-respect-flags-v2.patch" # Avoid use of WRITE_SAME_16 in Linux 2.6.32 and earlier epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch" fi + + # Apply kernel-specific patches + emake KSRC="${KERNEL_DIR}" patch || die + + epatch_user } src_compile() { diff --git a/sys-block/iscsitarget/iscsitarget-9999.ebuild b/sys-block/iscsitarget/iscsitarget-9999.ebuild index 4b15ff0d35b5..b91420378070 100644 --- a/sys-block/iscsitarget/iscsitarget-9999.ebuild +++ b/sys-block/iscsitarget/iscsitarget-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-9999.ebuild,v 1.1 2013/01/03 11:09:58 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-9999.ebuild,v 1.2 2013/08/21 14:29:48 ryao Exp $ EAPI="4" @@ -8,7 +8,7 @@ inherit linux-mod eutils flag-o-matic if [ ${PV} == "9999" ] ; then inherit subversion - ESVN_REPO_URI="http://iscsitarget.svn.sourceforge.net/svnroot/iscsitarget/trunk" + ESVN_REPO_URI="http://svn.code.sf.net/p/iscsitarget/code/trunk" else SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.gz" KEYWORDS="~amd64 ~ppc ~x86" @@ -43,15 +43,17 @@ src_prepare() { # Fix build system to apply proper patches epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-fix-3.2-support.patch" - # Apply kernel-specific patches - emake KSRC="${KERNEL_DIR}" patch || die - # Respect LDFLAGS. Bug #365735 epatch "${FILESDIR}/${PN}-1.4.20.2-respect-flags-v2.patch" # Avoid use of WRITE_SAME_16 in Linux 2.6.32 and earlier epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch" fi + + # Apply kernel-specific patches + emake KSRC="${KERNEL_DIR}" patch || die + + epatch_user } src_compile() { |