From fd5ea749e017b956f0f50aea8374cbfb182ec010 Mon Sep 17 00:00:00 2001 From: Christian Zoffoli Date: Wed, 30 Aug 2006 15:15:29 +0000 Subject: Version bump. (Portage version: 2.1-r1) --- sys-cluster/gfs-kernel/ChangeLog | 9 +- .../gfs-kernel/files/digest-gfs-kernel-1.03.00 | 3 + .../gfs-kernel-1.03.00-pre2.6.17-compilefix.patch | 125 +++++++++++++++++++++ sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild | 66 +++++++++++ 4 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.03.00 create mode 100644 sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch create mode 100644 sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild (limited to 'sys-cluster/gfs-kernel') diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog index d9f2ea59bf53..391d5a96cfe0 100644 --- a/sys-cluster/gfs-kernel/ChangeLog +++ b/sys-cluster/gfs-kernel/ChangeLog @@ -1,6 +1,13 @@ # 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.16 2006/08/24 18:50:34 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.17 2006/08/30 15:15:29 xmerlin Exp $ + +*gfs-kernel-1.03.00 (30 Aug 2006) + + 30 Aug 2006; Christian Zoffoli + +files/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch, + +gfs-kernel-1.03.00.ebuild: + Version bump. 24 Aug 2006; Christian Zoffoli gfs-kernel-1.02.00-r1.ebuild: diff --git a/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.03.00 b/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.03.00 new file mode 100644 index 000000000000..09fda78c7e81 --- /dev/null +++ b/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.03.00 @@ -0,0 +1,3 @@ +MD5 8eea23df70d2007c4fb8c234cfea49cf cluster-1.03.00.tar.gz 1658274 +RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 cluster-1.03.00.tar.gz 1658274 +SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b cluster-1.03.00.tar.gz 1658274 diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch new file mode 100644 index 000000000000..d9ead98e8224 --- /dev/null +++ b/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch @@ -0,0 +1,125 @@ +diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/diaper.c cluster-1.03.00/gfs-kernel/src/gfs/diaper.c +--- cluster-1.03.00.orig/gfs-kernel/src/gfs/diaper.c 2006-06-26 23:53:51.000000000 +0200 ++++ cluster-1.03.00/gfs-kernel/src/gfs/diaper.c 2006-08-30 18:18:06.000000000 +0200 +@@ -232,9 +232,9 @@ + struct inode *inode; + int error; + +- mutex_lock(&real->bd_mount_mutex); ++ down(&real->bd_mount_sem); + sb = sget(&gfs_fs_type, gfs_test_bdev_super, gfs_set_bdev_super, real); +- mutex_unlock(&real->bd_mount_mutex); ++ up(&real->bd_mount_sem); + if (IS_ERR(sb)) + return PTR_ERR(sb); + +@@ -363,7 +363,7 @@ + if (!diaper) + goto fail_remove; + +- mutex_lock(&diaper->bd_mutex); ++ down(&diaper->bd_sem); + if (!diaper->bd_openers) { + diaper->bd_disk = gd; + diaper->bd_contains = diaper; +@@ -372,7 +372,7 @@ + } else + printk("GFS: diaper: reopening\n"); + diaper->bd_openers++; +- mutex_unlock(&diaper->bd_mutex); ++ up(&diaper->bd_sem); + + dh->dh_mempool = mempool_create(512, + mempool_alloc_slab, mempool_free_slab, +@@ -395,14 +395,14 @@ + mempool_destroy(dh->dh_mempool); + + fail_bdput: +- mutex_lock(&diaper->bd_mutex); ++ down(&diaper->bd_sem); + if (!--diaper->bd_openers) { + invalidate_bdev(diaper, 1); + diaper->bd_contains = NULL; + diaper->bd_disk = NULL; + } else + printk("GFS: diaper: not closed\n"); +- mutex_unlock(&diaper->bd_mutex); ++ up(&diaper->bd_sem); + bdput(diaper); + + fail_remove: +@@ -437,14 +437,14 @@ + + mempool_destroy(dh->dh_mempool); + +- mutex_lock(&diaper->bd_mutex); ++ down(&diaper->bd_sem); + if (!--diaper->bd_openers) { + invalidate_bdev(diaper, 1); + diaper->bd_contains = NULL; + diaper->bd_disk = NULL; + } else + printk("GFS: diaper: not closed\n"); +- mutex_unlock(&diaper->bd_mutex); ++ up(&diaper->bd_sem); + + bdput(diaper); + del_gendisk(gd); +diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_file.c cluster-1.03.00/gfs-kernel/src/gfs/ops_file.c +--- cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_file.c 2006-06-29 18:50:41.000000000 +0200 ++++ cluster-1.03.00/gfs-kernel/src/gfs/ops_file.c 2006-08-30 18:18:06.000000000 +0200 +@@ -1465,13 +1465,12 @@ + + if (sdp->sd_args.ar_localflocks) { + if (IS_GETLK(cmd)) { +- struct file_lock tmp; +- int ret; ++ struct file_lock *tmp; + lock_kernel(); +- ret = posix_test_lock(file, fl, &tmp); ++ tmp = posix_test_lock(file, fl); + fl->fl_type = F_UNLCK; +- if (ret) +- memcpy(fl, &tmp, sizeof(struct file_lock)); ++ if (tmp) ++ memcpy(fl, tmp, sizeof(struct file_lock)); + unlock_kernel(); + return 0; + } else { +diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_fstype.c cluster-1.03.00/gfs-kernel/src/gfs/ops_fstype.c +--- cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_fstype.c 2006-06-29 18:50:41.000000000 +0200 ++++ cluster-1.03.00/gfs-kernel/src/gfs/ops_fstype.c 2006-08-30 18:18:06.000000000 +0200 +@@ -697,9 +697,9 @@ + return (struct super_block *)diaper; + } + +- mutex_lock(&diaper->bd_mount_mutex); ++ down(&diaper->bd_mount_sem); + sb = sget(fs_type, gfs_test_bdev_super, gfs_set_bdev_super, diaper); +- mutex_unlock(&diaper->bd_mount_mutex); ++ up(&diaper->bd_mount_sem); + if (IS_ERR(sb)) + goto out; + +diff -uNr cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c cluster-1.03.00/gfs-kernel/src/nolock/main.c +--- cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c 2006-08-16 23:53:20.000000000 +0200 ++++ cluster-1.03.00/gfs-kernel/src/nolock/main.c 2006-08-30 18:18:06.000000000 +0200 +@@ -243,14 +243,13 @@ + struct lm_lockname *name, + struct file *file, struct file_lock *fl) + { +- struct file_lock tmp; +- int ret; ++ struct file_lock *tmp; + + lock_kernel(); +- ret = posix_test_lock(file, fl, &tmp); ++ tmp = posix_test_lock(file, fl); + fl->fl_type = F_UNLCK; +- if (ret) +- memcpy(fl, &tmp, sizeof(struct file_lock)); ++ if (tmp) ++ memcpy(fl, tmp, sizeof(struct file_lock)); + unlock_kernel(); + + return 0; diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild new file mode 100644 index 000000000000..d185bdf9e986 --- /dev/null +++ b/sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild @@ -0,0 +1,66 @@ +# 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.03.00.ebuild,v 1.1 2006/08/30 15:15:29 xmerlin Exp $ + +inherit eutils linux-mod + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="" + +DEPEND="|| ( + >=sys-kernel/vanilla-sources-2.6.12 + >=sys-kernel/gentoo-sources-2.6.12 + ) + >=sys-cluster/dlm-headers-1.03.00 + >=sys-cluster/cman-headers-1.03.00" + +RDEPEND="" + +S="${WORKDIR}/${MY_P}/${PN}" + +pkg_setup() { + if kernel_is 2 4; then + die "${P} supports only 2.6 kernels" + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + + if kernel_is 2 6; then + if [ "$KV_PATCH" -lt "17" ] ; then + epatch ${FILESDIR}/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch || die + fi + fi +} + +src_compile() { + check_KV + set_arch_to_kernel + + ./configure --kernel_src=${KERNEL_DIR} --verbose || die + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + rm -f ${D}/usr/include/linux/* || die +} + +pkg_postinst() { + linux-mod_pkg_postinst + + einfo "" + einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!" + einfo "" +} -- cgit v1.2.3-65-gdbad