From: Christian Zoffoli Date: Fri, 9 Mar 2007 15:51:02 +0000 (+0000) Subject: Version bump, fixed compilation with older and newer kernels. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32c9ad6a197009e8fcdd2a508b1771b2a542b463;p=gentoo.git Version bump, fixed compilation with older and newer kernels. Package-Manager: portage-2.1.2-r9 --- diff --git a/sys-cluster/dlm-kernel/ChangeLog b/sys-cluster/dlm-kernel/ChangeLog index aa89ca0d3a6e..ebdead7a72d0 100644 --- a/sys-cluster/dlm-kernel/ChangeLog +++ b/sys-cluster/dlm-kernel/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/dlm-kernel # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.26 2007/01/13 01:55:27 marineam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.27 2007/03/09 15:51:02 xmerlin Exp $ + +*dlm-kernel-1.04.00 (03 Mar 2007) + + 09 Mar 2007; Christian Zoffoli + dlm-kernel-1.02.00-r1.ebuild, dlm-kernel-1.03.00.ebuild, + +dlm-kernel-1.04.00.ebuild: + Version bump, fixed compilation with older and newer kernels. 13 Jan 2007; Michael Marineau dlm-kernel-1.02.00-r1.ebuild, dlm-kernel-1.03.00.ebuild: diff --git a/sys-cluster/dlm-kernel/Manifest b/sys-cluster/dlm-kernel/Manifest index d9d6d79d875f..80c08f191c95 100644 --- a/sys-cluster/dlm-kernel/Manifest +++ b/sys-cluster/dlm-kernel/Manifest @@ -3,19 +3,24 @@ Hash: SHA1 DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 SHA1 d74cadb1ef21d1cfda333b20d7ef20272e0002d6 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b +DIST cluster-1.04.00.tar.gz 1663798 RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 SHA1 af3bb244a11a6a26c31b142009f6c1f771799337 SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 DIST dlm-kernel-1.02.00-20060714-cvs.patch.gz 2988 RMD160 72466639d655ab725aaf2db0c71cedbff0e0b089 SHA1 f82c421c7ff2fbe223d9a7736c230bfecc4d7a37 SHA256 48081d39b2a6895c696f1e860b09a1b049c50a8588137ac88f0e9654fafbcaab -EBUILD dlm-kernel-1.02.00-r1.ebuild 1527 RMD160 53de2e89e670ab4ba56762b1dbf55ea304b78641 SHA1 245f15f34a278922a874521fb3abe627135bbf4b SHA256 e8102c706f10944fe311c3f6496ae08266a0ec2a0155448e2eb8ba4ec4bd7d35 -MD5 1aa92753de42f8a5c50e3244a040827e dlm-kernel-1.02.00-r1.ebuild 1527 -RMD160 53de2e89e670ab4ba56762b1dbf55ea304b78641 dlm-kernel-1.02.00-r1.ebuild 1527 -SHA256 e8102c706f10944fe311c3f6496ae08266a0ec2a0155448e2eb8ba4ec4bd7d35 dlm-kernel-1.02.00-r1.ebuild 1527 -EBUILD dlm-kernel-1.03.00.ebuild 1263 RMD160 1d8231980fca7fd20d349c4b4ae6296327be5ef7 SHA1 0309c6c5cbd269dc46b77bae8d707a7c221b4ad5 SHA256 9bf0e2e2eb00b64f728c994b33c5dcdefc3ff6d713fe84d8ba7a68dfeef0cd79 -MD5 cf4ecd921885f4f44d39ba49201f7487 dlm-kernel-1.03.00.ebuild 1263 -RMD160 1d8231980fca7fd20d349c4b4ae6296327be5ef7 dlm-kernel-1.03.00.ebuild 1263 -SHA256 9bf0e2e2eb00b64f728c994b33c5dcdefc3ff6d713fe84d8ba7a68dfeef0cd79 dlm-kernel-1.03.00.ebuild 1263 -MISC ChangeLog 3789 RMD160 17acf7bfb69f9868b772e0f4c0d20b56e6f56158 SHA1 832b879008c3d603c197df3ea8b46d629f5af933 SHA256 bc77cb110b950296e05d1edf002409ee0133ffad752bb32741ae6810fab4e607 -MD5 8f89654fbebb0736981830a34faba66a ChangeLog 3789 -RMD160 17acf7bfb69f9868b772e0f4c0d20b56e6f56158 ChangeLog 3789 -SHA256 bc77cb110b950296e05d1edf002409ee0133ffad752bb32741ae6810fab4e607 ChangeLog 3789 +EBUILD dlm-kernel-1.02.00-r1.ebuild 1574 RMD160 acf97c8f8c67f9294f44e5a3a12a93fa53b731fc SHA1 be55f8d321712ad77fdf0635366d5a72df922be1 SHA256 36bf9e6e52d3b0f413b6ca9a2a6fb1f16f44e83f6f10256ba880867531e20c5d +MD5 27fdfbe66761515628cccb556cf2edb9 dlm-kernel-1.02.00-r1.ebuild 1574 +RMD160 acf97c8f8c67f9294f44e5a3a12a93fa53b731fc dlm-kernel-1.02.00-r1.ebuild 1574 +SHA256 36bf9e6e52d3b0f413b6ca9a2a6fb1f16f44e83f6f10256ba880867531e20c5d dlm-kernel-1.02.00-r1.ebuild 1574 +EBUILD dlm-kernel-1.03.00.ebuild 1312 RMD160 a0c5d1580f3c77bcb8b3f67fc1c791b8d538e012 SHA1 24a21e5d5621699d1efaf90afd5eb4f2c39ec365 SHA256 55fb255f5aafc41ea4b80b26f484c0580efb9caca650ddabdfcf6a5e36a1b803 +MD5 b6c990181b412af1120f5306ed9f8f93 dlm-kernel-1.03.00.ebuild 1312 +RMD160 a0c5d1580f3c77bcb8b3f67fc1c791b8d538e012 dlm-kernel-1.03.00.ebuild 1312 +SHA256 55fb255f5aafc41ea4b80b26f484c0580efb9caca650ddabdfcf6a5e36a1b803 dlm-kernel-1.03.00.ebuild 1312 +EBUILD dlm-kernel-1.04.00.ebuild 1513 RMD160 8f78c9c7330edae0c803f4cb114d468194d9a80c SHA1 67bbeb732dde8f1fb92ee7eea42116a38a5b5ad4 SHA256 ef2d8e31cceba212f504939901ef250c84d84c45a674e8fe6fdfa98662ac82e2 +MD5 de7ec3521daa66be9ba3db1b480f10af dlm-kernel-1.04.00.ebuild 1513 +RMD160 8f78c9c7330edae0c803f4cb114d468194d9a80c dlm-kernel-1.04.00.ebuild 1513 +SHA256 ef2d8e31cceba212f504939901ef250c84d84c45a674e8fe6fdfa98662ac82e2 dlm-kernel-1.04.00.ebuild 1513 +MISC ChangeLog 4031 RMD160 750d3b6f1a0a2b84827e88d607964907ce19acd4 SHA1 8d57c17259ac12335ad56a6916dea94446c95ce4 SHA256 38c05039a9ec18629ea16f2dd248ad4d9d1f5f3552f0d64e60e1a7bb8897982d +MD5 bfadc09214f350cd75246bb312a7f5e2 ChangeLog 4031 +RMD160 750d3b6f1a0a2b84827e88d607964907ce19acd4 ChangeLog 4031 +SHA256 38c05039a9ec18629ea16f2dd248ad4d9d1f5f3552f0d64e60e1a7bb8897982d ChangeLog 4031 MISC metadata.xml 223 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d SHA1 033d2c47eb2bfe68e657ac2d68a7bfd28aab5b22 SHA256 b75b89c431f244420a0c81f9157c9fc656a919a8aac011778e1b410f70851bd3 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d metadata.xml 223 @@ -26,10 +31,13 @@ SHA256 8762f49e08cd46b3e74f76796d5c538680982c62532e306460cddbecec88d3ee files/di MD5 e127cf65d51c816513b658dbed429e5f files/digest-dlm-kernel-1.03.00 250 RMD160 5332ca5282fb5b303388c7939ecc08b44aa340eb files/digest-dlm-kernel-1.03.00 250 SHA256 2cebe51521eb8f9a520e29bb0d8baa5820ef747d5e5e18218a5d1880e40167f8 files/digest-dlm-kernel-1.03.00 250 +MD5 648c6ee5451d59bbe7aa185da1c4e1b5 files/digest-dlm-kernel-1.04.00 250 +RMD160 c6f4b2412d1edf08cf42e538e447b2fea8aafd8e files/digest-dlm-kernel-1.04.00 250 +SHA256 358be21a647dcb0388ec46ddf8044de17a3fdb8c57b0f63e5bcc6340eb476d31 files/digest-dlm-kernel-1.04.00 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFqDwbiP+LossGzjARAuA7AJ4vmcl0MDniGdNTL5q5hTFIvHzYgwCfYI+V -2M4ujtBJcINtt3Xf/Y/rxys= -=AylM +iD8DBQFF8YJvgMUyd/cdjWsRAhMPAJoDOeXYaguDi25AojBXsIBzI7EzMQCdEM+Q +wPT+yelfYvy1xELe7VKjUDM= +=4acC -----END PGP SIGNATURE----- diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild index bbb236123d00..4d28c42f9d8e 100644 --- a/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild +++ b/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.9 2007/01/13 01:55:27 marineam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.10 2007/03/09 15:51:02 xmerlin Exp $ inherit eutils linux-mod linux-info +CLUSTER_RELEASE="1.02.00" +MY_P="cluster-${CLUSTER_RELEASE}" CVS_RELEASE="20060714" -MY_P="cluster-${PV}" DESCRIPTION="General-purpose Distributed Lock Manager kernel module" HOMEPAGE="http://sources.redhat.com/cluster/" @@ -22,7 +23,7 @@ DEPEND="|| ( >=sys-kernel/vanilla-sources-2.6.16 >=sys-kernel/gentoo-sources-2.6.16 ) - >=sys-cluster/cman-headers-1.02.00-r1" + =sys-cluster/cman-headers-${CLUSTER_RELEASE}*" RDEPEND="" diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild index f4293ce32471..0634f0a09fd6 100644 --- a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild +++ b/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.6 2007/01/13 01:55:27 marineam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.7 2007/03/09 15:51:02 xmerlin Exp $ inherit eutils linux-mod linux-info -MY_P="cluster-${PV}" +CLUSTER_RELEASE="1.03.00" +MY_P="cluster-${CLUSTER_RELEASE}" DESCRIPTION="General-purpose Distributed Lock Manager kernel module" HOMEPAGE="http://sources.redhat.com/cluster/" @@ -19,7 +20,7 @@ DEPEND="|| ( >=sys-kernel/vanilla-sources-2.6.16 >=sys-kernel/gentoo-sources-2.6.16 ) - >=sys-cluster/cman-headers-1.03.00" + =sys-cluster/cman-headers-${CLUSTER_RELEASE}*" RDEPEND="" diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild new file mode 100644 index 000000000000..eea5ae582fc7 --- /dev/null +++ b/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild,v 1.1 2007/03/09 15:51:02 xmerlin Exp $ + +inherit eutils linux-mod linux-info + +CLUSTER_RELEASE="1.04.00" +MY_P="cluster-${CLUSTER_RELEASE}" + +DESCRIPTION="General-purpose Distributed Lock Manager kernel module" +HOMEPAGE="http://sources.redhat.com/cluster/" +SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="|| ( + >=sys-kernel/vanilla-sources-2.6.16 + >=sys-kernel/gentoo-sources-2.6.16 + ) + =sys-cluster/cman-headers-${CLUSTER_RELEASE}*" + +RDEPEND="" + +S="${WORKDIR}/${MY_P}/${PN}" + +pkg_setup() { + linux-mod_pkg_setup + case ${KV_FULL} in + 2.2.*|2.4.*) die "${P} supports only 2.6 kernels";; + esac +} + +src_unpack() { + unpack ${A} + cd ${S} + + if kernel_is 2 6; then + if [ "$KV_PATCH" -lt "18" ] ; then + sed -i \ + -e 's|utsrelease.h|version.h|g' \ + configure \ + || die "sed failed" + fi + fi +} + +src_compile() { + set_arch_to_kernel + + ./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem" + emake || die "compile problem" +} + +src_install() { + emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem" + rm -f ${D}/usr/include/cluster/* +} + + +pkg_postinst() { + linux-mod_pkg_postinst + + einfo "" + einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!" + einfo "" +} diff --git a/sys-cluster/dlm-kernel/files/digest-dlm-kernel-1.04.00 b/sys-cluster/dlm-kernel/files/digest-dlm-kernel-1.04.00 new file mode 100644 index 000000000000..2f86eed7f8e5 --- /dev/null +++ b/sys-cluster/dlm-kernel/files/digest-dlm-kernel-1.04.00 @@ -0,0 +1,3 @@ +MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798 +RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798 +SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798