diff options
author | Christian Zoffoli <xmerlin@gentoo.org> | 2006-07-14 15:01:47 +0000 |
---|---|---|
committer | Christian Zoffoli <xmerlin@gentoo.org> | 2006-07-14 15:01:47 +0000 |
commit | a007a76ea755f981f9c7747ed68dbafbd2a815f3 (patch) | |
tree | 817e570f5a7218d06444b0e5c311217bbed5bacf /sys-cluster/gfs-kernel | |
parent | stable on ia64. (diff) | |
download | gentoo-2-a007a76ea755f981f9c7747ed68dbafbd2a815f3.tar.gz gentoo-2-a007a76ea755f981f9c7747ed68dbafbd2a815f3.tar.bz2 gentoo-2-a007a76ea755f981f9c7747ed68dbafbd2a815f3.zip |
Splitted path, now gfs-kernel compiles fine with 2.6.17 and older kernels
(Portage version: 2.1-r1)
Diffstat (limited to 'sys-cluster/gfs-kernel')
-rw-r--r-- | sys-cluster/gfs-kernel/ChangeLog | 6 | ||||
-rw-r--r-- | sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1 | 9 | ||||
-rw-r--r-- | sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild | 21 |
3 files changed, 26 insertions, 10 deletions
diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog index e21296bb7b80..a8f4f9a43810 100644 --- a/sys-cluster/gfs-kernel/ChangeLog +++ b/sys-cluster/gfs-kernel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/gfs-kernel # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.14 2006/07/14 12:20:30 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.15 2006/07/14 15:01:46 xmerlin Exp $ + + 14 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org> + gfs-kernel-1.02.00-r1.ebuild: + Splitted path, now gfs-kernel compiles fine with 2.6.17 and older kernels *gfs-kernel-1.02.00-r1 (13 Jul 2006) diff --git a/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1 b/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1 index 9292298b6a0b..7b137a3e5d96 100644 --- a/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1 +++ b/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1 @@ -1,6 +1,9 @@ MD5 131c34c8b66d8d7d74384839ed4091d0 cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 cluster-1.02.00.tar.gz 1356451 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849 cluster-1.02.00.tar.gz 1356451 -MD5 578820bbc46d547ad82ce57f6c30c4fa gfs-kernel-1.02.00-20060714-cvs.patch.gz 5731 -RMD160 8bc62c94968fa018ca303f55495cc1e74d218298 gfs-kernel-1.02.00-20060714-cvs.patch.gz 5731 -SHA256 1e90dbc6e3e446efee520bf61e098a413f145347dfb120f63452de4570390487 gfs-kernel-1.02.00-20060714-cvs.patch.gz 5731 +MD5 67c38ef215cfccbafbfcd7d8e40867b4 gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919 +RMD160 9cd7c3df465a1c85fc59a57ee601f4b6b589284f gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919 +SHA256 39fb40d83cd4547a45ef00c11714392a7cc15b968b5c7aa05fd96eb63d9c7196 gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919 +MD5 916c21631d512bda65fcbdc43bcba1b5 gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086 +RMD160 bc10691dbdd4afb6d8fa8618f3b42d54792fb3bf gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086 +SHA256 7a6a7b531f9cd73a3b2ab46849372862d1903a9a0d879544ef60599762ad9ff6 gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086 diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild index bd419c3ba570..2d54ba00ed7c 100644 --- a/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild +++ b/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild,v 1.1 2006/07/14 12:20:30 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild,v 1.2 2006/07/14 15:01:46 xmerlin Exp $ inherit eutils linux-mod @@ -10,8 +10,11 @@ MY_P="cluster-${PV}" DESCRIPTION="GFS kernel module" HOMEPAGE="http://sources.redhat.com/cluster/" SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz - mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs.patch.gz - http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs.patch.gz" + mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz + mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz + http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz + http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz + " LICENSE="GPL-2" SLOT="0" @@ -20,8 +23,8 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="" DEPEND="|| ( - >=sys-kernel/vanilla-sources-2.6.17 - >=sys-kernel/gentoo-sources-2.6.17 + >=sys-kernel/vanilla-sources-2.6.12 + >=sys-kernel/gentoo-sources-2.6.12 ) >=sys-cluster/dlm-headers-1.02.00-r1 >=sys-cluster/cman-headers-1.02.00-r1" @@ -33,7 +36,13 @@ S="${WORKDIR}/${MY_P}/${PN}" src_unpack() { unpack ${A} cd ${S} - epatch ${WORKDIR}/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs.patch || die + + epatch ${WORKDIR}/gfs-kernel-1.02.00-20060714-cvs-part1.patch || die + if kernel_is 2 6; then + if [ "$KV_PATCH" -gt "16" ] ; then + epatch ${WORKDIR}/gfs-kernel-1.02.00-20060714-cvs-part2.patch || die + fi + fi epatch ${FILESDIR}/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-compile.patch || die } |