diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2011-07-15 13:57:09 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2011-07-15 13:57:09 +0000 |
| commit | 2d8632f86b0e92675511c6addb9e97f13e49a870 (patch) | |
| tree | fb6b2195997279fcf0cae62223d2cda27f85fd6b /sys-cluster | |
| parent | dev-vcs/gitg: 0.2.2 (diff) | |
| download | historical-2d8632f86b0e92675511c6addb9e97f13e49a870.tar.gz historical-2d8632f86b0e92675511c6addb9e97f13e49a870.tar.bz2 historical-2d8632f86b0e92675511c6addb9e97f13e49a870.zip | |
sys-cluster/pvfs2 removal (pending 9th July 2011) wrt #337374
Diffstat (limited to 'sys-cluster')
24 files changed, 0 insertions, 2093 deletions
diff --git a/sys-cluster/pvfs2/ChangeLog b/sys-cluster/pvfs2/ChangeLog deleted file mode 100644 index 13045861be76..000000000000 --- a/sys-cluster/pvfs2/ChangeLog +++ /dev/null @@ -1,143 +0,0 @@ -# ChangeLog for sys-cluster/pvfs2 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.25 2011/03/29 12:55:34 angelos Exp $ - - 29 Mar 2011; Christoph Mende <angelos@gentoo.org> pvfs2-2.7.0-r2.ebuild, - pvfs2-2.7.1.ebuild, pvfs2-2.7.1-r1.ebuild: - Fix gtk+ slot deps - - 23 Oct 2009; Justin Bronder <jsbronder@gentoo.org> pvfs2-2.7.0-r2.ebuild: - Die if install fails. Thanks to Tove for noticing. - -*pvfs2-2.7.1-r1 (27 Sep 2009) - - 27 Sep 2009; Justin Bronder <jsbronder@gentoo.org> +pvfs2-2.7.1-r1.ebuild, - +files/pvfs2-2.7.1-2.6.29-fixes.patch, - +files/pvfs2-2.7.1-2.6.30-fixes.patch: - Backport upstream fixes for kernels 2.6.{29,30} (#255556). Thanks to - nerdboy for tracking down the necessary changes. - - 05 Jul 2009; Markus Meier <maekke@gentoo.org> pvfs2-2.7.1.ebuild: - amd64 stable, bug #266409 - - 02 May 2009; Raúl Porcel <armin76@gentoo.org> pvfs2-2.7.1.ebuild: - x86 stable wrt #266409 - - 18 Apr 2009; nixnut <nixnut@gentoo.org> pvfs2-2.7.1.ebuild: - ppc stable #266409 - - 12 Feb 2009; Justin Bronder <jsbronder@gentoo.org> metadata.xml: - Taking over as maintainer. - - 04 Sep 2008; Steve Arnold <nerdboy@gentoo.org> +files/pvfs2-super.c.patch, - pvfs2-2.7.1.ebuild: - Updated with upstream patch for kernel 2.6.26 incompatible pointer type - - http://www.beowulf-underground.org/pipermail/pvfs2-users/2008-July/002506.html - Also disabled experimental threaded kmod helper. - - 28 Jul 2008; Panagiotis Christopoulos <pchrist@gentoo.org> metadata.xml: - Update metadata.xml to include USE flag descriptions. Entries taken from - profiles/use.local.desc - - 29 May 2008; Justin Bronder <jsbronder@gentoo.org> ChangeLog: - Use KV_OUT_DIR to support out of tree kernel builds. (#223779). - - 13 May 2008; Justin Bronder <jsbronder@gentoo.org> pvfs2-2.7.0-r2.ebuild, - pvfs2-2.7.1.ebuild: - Update depends to not require doc building packages at runtime. (#221695) - - 21 Apr 2008; Justin Bronder <jsbronder@gentoo.org> pvfs2-2.7.1.ebuild: - Fix build error with 2.6.25 kernels (#218310). Thanks to Michael Cramer for - the report and fix. - - 17 Apr 2008; Justin Bronder <jsbronder@gentoo.org> - -files/2.6.3-no-pointer-sign.patch, - -files/2.6.3-register_sysctl_table.patch, -files/2.6.3-soname.patch, - -files/2.7.0-lib-install.patch, -files/2.6.3-as-needed.patch, - -files/2.6.3-kmem-and-dtor-fix.patch, - -files/2.6.3-link-librt-properly.patch, -files/2.7.0-soname.patch, - -files/pvfs2-1.5.1-destdir.patch, -pvfs2-1.5.1.ebuild, - -pvfs2-2.6.3.ebuild, -pvfs2-2.6.3-r1.ebuild, -pvfs2-2.7.0.ebuild, - -pvfs2-2.7.0-r1.ebuild: - Cleanout old versions. - -*pvfs2-2.7.1 (17 Apr 2008) - - 17 Apr 2008; Justin Bronder <jsbronder@gentoo.org> - +files/pvfs2-split-kernapps.patch, +pvfs2-2.7.1.ebuild: - Bump pvfs2 to 2.7.1. Added threads use flag for the client threaded - libraries. - -*pvfs2-2.7.0-r2 (10 Mar 2008) - - 10 Mar 2008; Justin Bronder <jsbronder@gentoo.org> - +files/2.7.0-configure-static-server.patch, +pvfs2-2.7.0-r2.ebuild: - Correctly use the static use flag to build pvfs2-server and always build - both static and shared libraries. - -*pvfs2-2.7.0-r1 (06 Mar 2008) - - 06 Mar 2008; Justin Bronder <jsbronder@gentoo.org> - +files/pvfs2-client-conf.d-2.7.0, +files/pvfs2-client-init.d-2.7.0, - +files/pvfs2-server-conf.d-2.7.0, +files/pvfs2-server-init.d-2.7.0, - +files/2.7.0-ctl_unnumbered.patch, +files/2.7.0-gentoo-makefile.patch, - +files/2.7.0-kernel-rt.patch, +files/2.7.0-kmem_cache.patch, - +files/2.7.0-verbose-checking.patch, +pvfs2-2.7.0-r1.ebuild: - Fix bug #210923. Support kernel 2.6.24. One patch for Makefile. Support - more than one pvfs2 mountpoint and cleanup init/conf stuff for single pvfs2 - config file layout. General cleanup all around. - -*pvfs2-2.7.0 (02 Dec 2007) - - 02 Dec 2007; Steve Arnold <nerdboy@gentoo.org> +pvfs2-2.7.0.ebuild, - +files/2.7.0-lib-install.patch, +files/2.7.0-soname.patch: - Added latest upstream release to address shared library issues and - dependent packages (eg, mpich2, hdf5-parallel, etc). Also enabled - the shared version of libpvfs2-threaded. This is definitely the one - you want if you need the latest cluster/MPI support (although the - threaded lib needs testing). - - 17 Oct 2007; Steve Arnold <nerdboy@gentoo.org> pvfs2-2.6.3-r1.ebuild, - pvfs2-2.6.3.ebuild, pvfs2-1.5.1.ebuild: - keywording for amd64 (needed for mpich2 and probably others) plus a few - minor QA fixes. - -*pvfs2-2.6.3-r1 (13 Oct 2007) - - 13 Oct 2007; Matti Bickel <mabi@gentoo.org> +pvfs2-2.6.3-r1.ebuild: - added server to IUSE, missed credits for the 2.6.3 ebuild: thanks to - Fernando Gutiérrez, Justin Bronder for all the work, tiny updates by me and - Adrian Knoth (all private email) - -*pvfs2-2.6.3 (05 Oct 2007) - - 05 Oct 2007; Matti Bickel <mabi@gentoo.org> +files/2.6.3-as-needed.patch, - +files/2.6.3-kmem-and-dtor-fix.patch, - +files/2.6.3-link-librt-properly.patch, - +files/2.6.3-no-pointer-sign.patch, - +files/2.6.3-register_sysctl_table.patch, +files/2.6.3-soname.patch, - +files/pvfs2-client.conf, +files/pvfs2-client-init.d, - +files/pvfs2-server.conf, +files/pvfs2-server.rc, +pvfs2-2.6.3.ebuild: - revbump to 2.6.3 + backported kmem fix - - 26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml: - Update for cluster herd split to hp-cluster and ha-cluster. - - 24 Jul 2006; Stefan Schweizer <genstef@gentoo.org> - +files/pvfs2-1.5.1-destdir.patch: - Version bump, use linux-mod.eclass thanks to Daniel Black - <dragonheart@gentoo.org> in bug 121962 - - 06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; pvfs2-1.2.0.ebuild: - (#103487) Don't use cp -a, it's GNU-specific. - - 12 Aug 2005; David Holm <dholm@gentoo.org> pvfs2-1.2.0.ebuild: - Added to ~ppc. - -*pvfs2-1.2.0 (11 Aug 2005) - - 11 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml, - +pvfs2-1.2.0.ebuild: - Ebuild by Robin H. Johnson <robbat2@gentoo.org>, with help from Patrick - Lougheed <private_email>. - diff --git a/sys-cluster/pvfs2/Manifest b/sys-cluster/pvfs2/Manifest deleted file mode 100644 index 48e86182d003..000000000000 --- a/sys-cluster/pvfs2/Manifest +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX 2.7.0-configure-static-server.patch 469 RMD160 eab66ff3316c7114ad07d304ddefb38d5e00a395 SHA1 87ab288311cef2aa3b59a8052b9c496bdf3d6808 SHA256 e70694d82c711e901b8a9763db9d116ea9ef935678a645c93aaf5f4c41e7d210 -AUX 2.7.0-ctl_unnumbered.patch 6746 RMD160 f8041f1c971ce118a385925e52051064a6a80277 SHA1 4f29e9e6f40d533c3cc8ef0b806d7c8b6227d1de SHA256 5420e60d15f64172d47e908ae873da148ccacf69ab6d81f0c15d28bcd0af8eff -AUX 2.7.0-gentoo-makefile.patch 7176 RMD160 8946851367c19d08c72a3fcb69e659bf4961ddef SHA1 42db7f04eadc8faee632889ef0a6ecf2d8f81095 SHA256 ddbfbc80f95f93477027459faf4633033e48a98f270b263419d63765f4c682c9 -AUX 2.7.0-kernel-rt.patch 2871 RMD160 0f8cd7ef899f69d056dde46c730dfee64b9e03dc SHA1 ee00fa223e0bbf4bd10024271665a2a84e273b8c SHA256 e4848f3c8d6b2179895114c4d9cb2f89f9712a7ac73c3658cdfda77f9e9e1df2 -AUX 2.7.0-kmem_cache.patch 3811 RMD160 648b7a17078ef7928ca9e73d46954554deba5bc2 SHA1 a8a69b1ca273bbd21a1a079d93a8e086775bbe09 SHA256 e6ae6b0466f831b090ba05e848c7964fb2485ad1bb629c356fc15fd73f1068b7 -AUX 2.7.0-verbose-checking.patch 572 RMD160 50d692e671d26960e5d3f703a72a858803994376 SHA1 59f5656b4c8482d5c5b222337c376c7f8df00664 SHA256 7e40429b49e375b6b625f69053705b9bb5e40fe0a4c3e229819cbd2c3826e599 -AUX pvfs2-2.7.1-2.6.29-fixes.patch 8759 RMD160 18b66bc660fe95e97fe4f904c1924639951dbd3d SHA1 5d047dfaec7a7155fcf1758940c4030882481243 SHA256 351e37586ec492242db51e567f598c7867e1db0d7de301d7f6a2b8f878b3cafe -AUX pvfs2-2.7.1-2.6.30-fixes.patch 732 RMD160 b74d4e07d530f2fdda7ad73fefb6720e9d978d17 SHA1 a5d4d18de08e9e9ab5db262d87ea5b8984e6dbac SHA256 54c95d1c5464b8fa58e304adb7c7d223c1c1a47f87392ab320a1d36de3d75655 -AUX pvfs2-client-conf.d-2.7.0 640 RMD160 467e6c3bf46caa2e4f5331632a92c607830fa14c SHA1 dcbe86d8bb7cb236cac27fef5a79d561f59ab55c SHA256 8806ce51ede53dcce5b54a1f056dc4d4091097ba413d09a828595c075961256c -AUX pvfs2-client-init.d 1698 RMD160 ce6644995a1159b161fd06b88b48e175f33cd2c5 SHA1 57795ad8996c66a8196d07dc3537a101bc517f60 SHA256 5f30f14198b3e0ff62f66f2bd0c6d7d85662cf3b286627629b84d51876a9ca46 -AUX pvfs2-client-init.d-2.7.0 1999 RMD160 afa86aba6649ad31a42eee5f7a13e0e8b320bcc2 SHA1 c6a89c8717696a3d5008c9cab65b925ed83f4d6b SHA256 70dfe3e3def22919cdeb025e0f4daaa8e3ec7b06d35bc74cc6b27fbeddc5ed51 -AUX pvfs2-client.conf 451 RMD160 b76ed044ceb06b4fc420ed427bbaceeea593ffa0 SHA1 2dbf9c003a168b016789f019d9d5c09cd64a5ae7 SHA256 337b29fb849a8a37f02635b649cf278de356309d57dee4a871dbd1338a06a2f0 -AUX pvfs2-server-conf.d-2.7.0 561 RMD160 ea11685bbbbf66b0fca07b33a62aa2c194185687 SHA1 bd100931efd1d27a433b14d4298fa8c5d311fda0 SHA256 36ad9211b79141988cb57ab21b6d3062b728ad7a1b670c94dfec5e1349c535e3 -AUX pvfs2-server-init.d-2.7.0 1665 RMD160 1659d01727ded4d46b27d42731fcd8961a4e77cc SHA1 968a8f83ff3bf2c7c9ff82cb3afcf895bb10e055 SHA256 787f5f61aa0268cccf8140ed5a2c29c8a1eb5f9aea5cc0b43e50978d2c242e10 -AUX pvfs2-server.conf 988 RMD160 34c3413aed1e488c803928d9c2f94e9f5daa6450 SHA1 2637011019ecc1274cc3f039eb4870b74e118aaa SHA256 d20259d26773fdbcebc815eb47cc21ce01b5c6b6036bc843b7e9718cccb0eaed -AUX pvfs2-server.rc 2814 RMD160 4027463eca4ddc593519c27e8f4e3b101601e2d9 SHA1 87f7dc30eb6c262acaa4a247df11674dacec76bc SHA256 c9a0bc9d2c49bd1e30712bb6621e4c9a6622206e0d8a4487cc3a5eece0b0171f -AUX pvfs2-split-kernapps.patch 628 RMD160 b7a9a6cb0f227ba9f9105f8fdd23f76eed9760c5 SHA1 c405197e3f08e8ee1ad4ff1e0bd2e418f087ea3b SHA256 314a3da9e4afbc53af500291823492d1084a1b0a15dda52a3329835bcd66e7fa -AUX pvfs2-super.c.patch 1509 RMD160 543316efdea79f5f9669bfdf0de825275875508c SHA1 f1305a211dd736df3c43ef3da4a8d32d927abbd5 SHA256 e5aa142b7254653fd713a62ba7f7b70ce82d29779629f2735b1ede934b18ccee -DIST pvfs-2.7.0.tar.gz 2249993 RMD160 bc694aaf83029ea6cde4b2c64225f63203e2b862 SHA1 e5c3de5eec880fbaec7984ad1eee36f60564414e SHA256 5c781ba3943b7fa604617ba08a8da7651ac4b82fdc910b01ae7cfd6f32e87f85 -DIST pvfs-2.7.1.tar.gz 4466847 RMD160 483a956391af89bba38363bf64705f249ab040eb SHA1 2ce63310588945866c7c3ef3b040f64d87dc75e5 SHA256 3bcd34e839b5ba5d0645804721a4beb7f472363b95e9193094c205dfb6fcce7f -EBUILD pvfs2-2.7.0-r2.ebuild 5481 RMD160 0c4dff649cf51e5ce7d1756490e9334fc62eeb70 SHA1 f61793a0be6fe5b73b3323469cdc502829888cf0 SHA256 92a79caf0cbf6eff2f101c5e0b81418eacf7789c6846bb71c0afb30caa829244 -EBUILD pvfs2-2.7.1-r1.ebuild 4917 RMD160 7cdac922add21f3f8544c132f621b87326c7ba92 SHA1 8f405ecfec5f265e65727b8fd8f4760cdc133d95 SHA256 b1d1443a496e4f060d960bcf1a761f24f7d5b5f4acb515ab451e515be09c5acf -EBUILD pvfs2-2.7.1.ebuild 4584 RMD160 d2405ade58556317d4b5c5d06c79163adcc86d0c SHA1 ffcbb6fc23592fe27044c094481fea145ed7f5af SHA256 0f103125b113d3fc02beb911604a7c0f0581b537eb85f7457d1287e212c4fc16 -MISC ChangeLog 5945 RMD160 6eedbb6c0b19edb274775e6caf7925feb202bea0 SHA1 569d36112580fe7e7b287808df5a21be329b3374 SHA256 3685da5f0deb656418340e999a32246a5720ec5fcbe3c97090bf783e6e4f1053 -MISC metadata.xml 399 RMD160 38ed4cf06529a7bc0f5804c082925bd1dde3f089 SHA1 c6806b59b2416a6caf048bf9db495e86b87fdf41 SHA256 75d82d02bc7658a5fb4176645a8a69fd22dc1d2a4c1e4003ed9b775fe4adda5f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iF4EAREIAAYFAk2R1swACgkQmWq1bYTyC0PA8QD+K+mehur0lHjLmTQqj5ClMsof -WCVyVoCijFT5eWVLnNsA/Ary9I6k/jOKSxGUKodH0QHyafqpeEKUMJw8ql6WM58d -=iL+Z ------END PGP SIGNATURE----- diff --git a/sys-cluster/pvfs2/files/2.7.0-configure-static-server.patch b/sys-cluster/pvfs2/files/2.7.0-configure-static-server.patch deleted file mode 100644 index dbb2b3e2bf6c..000000000000 --- a/sys-cluster/pvfs2/files/2.7.0-configure-static-server.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- pvfs-2.7.0/configure.in 2007-11-13 17:41:52.000000000 -0500 -+++ pvfs-2.7.0_patched/configure.in 2008-03-09 20:56:55.000000000 -0400 -@@ -933,12 +933,14 @@ - - AC_ARG_ENABLE(static-server, - [ --enable-static-server Builds the server static], --[ -+[ staticserver=$enableval ], -+[ staticserver="no" ] ) -+ -+if test "$staticserver" = "yes"; then - SERVER_LDFLAGS="$LDFLAGS -static" --], --[ -+else - SERVER_LDFLAGS="$LDFLAGS -rdynamic" --]) -+fi - - AC_SUBST(SERVER_LDFLAGS) - diff --git a/sys-cluster/pvfs2/files/2.7.0-ctl_unnumbered.patch b/sys-cluster/pvfs2/files/2.7.0-ctl_unnumbered.patch deleted file mode 100644 index ed648842b7dd..000000000000 --- a/sys-cluster/pvfs2/files/2.7.0-ctl_unnumbered.patch +++ /dev/null @@ -1,239 +0,0 @@ -Index: src/kernel/linux-2.6/pvfs2-proc.c -=================================================================== -RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/pvfs2-proc.c,v -diff -u -r1.8 -r1.9 ---- src/kernel/linux-2.6/pvfs2-proc.c 19 Aug 2007 18:20:28 -0000 1.8 -+++ src/kernel/linux-2.6/pvfs2-proc.c 11 Jan 2008 15:20:16 -0000 1.9 -@@ -261,10 +261,19 @@ - static int min_debug[] = {0}, max_debug[] = {GOSSIP_MAX_DEBUG}; - static int min_op_timeout_secs[] = {0}, max_op_timeout_secs[] = {INT_MAX}; - -+/* -+ * Modern kernels prefer to number the controls themselves. -+ */ -+#ifdef CTL_UNNUMBERED -+#define UNNUMBERED_OR_VAL(x) CTL_UNNUMBERED -+#else -+#define UNNUMBERED_OR_VAL(x) x -+#endif -+ - static ctl_table pvfs2_acache_table[] = { - /* controls acache timeout */ - { -- .ctl_name = 1, -+ .ctl_name = UNNUMBERED_OR_VAL(1), - .procname = "timeout-msecs", - .maxlen = sizeof(int), - .mode = 0644, -@@ -273,7 +282,7 @@ - }, - /* controls acache hard limit */ - { -- .ctl_name = 2, -+ .ctl_name = UNNUMBERED_OR_VAL(2), - .procname = "hard-limit", - .maxlen = sizeof(int), - .mode = 0644, -@@ -282,7 +291,7 @@ - }, - /* controls acache soft limit */ - { -- .ctl_name = 3, -+ .ctl_name = UNNUMBERED_OR_VAL(3), - .procname = "soft-limit", - .maxlen = sizeof(int), - .mode = 0644, -@@ -291,7 +300,7 @@ - }, - /* controls acache reclaim percentage */ - { -- .ctl_name = 4, -+ .ctl_name = UNNUMBERED_OR_VAL(4), - .procname = "reclaim-percentage", - .maxlen = sizeof(int), - .mode = 0644, -@@ -303,7 +312,7 @@ - static ctl_table pvfs2_ncache_table[] = { - /* controls ncache timeout */ - { -- .ctl_name = 1, -+ .ctl_name = UNNUMBERED_OR_VAL(1), - .procname = "timeout-msecs", - .maxlen = sizeof(int), - .mode = 0644, -@@ -312,7 +321,7 @@ - }, - /* controls ncache hard limit */ - { -- .ctl_name = 2, -+ .ctl_name = UNNUMBERED_OR_VAL(2), - .procname = "hard-limit", - .maxlen = sizeof(int), - .mode = 0644, -@@ -321,7 +330,7 @@ - }, - /* controls ncache soft limit */ - { -- .ctl_name = 3, -+ .ctl_name = UNNUMBERED_OR_VAL(3), - .procname = "soft-limit", - .maxlen = sizeof(int), - .mode = 0644, -@@ -330,7 +339,7 @@ - }, - /* controls ncache reclaim percentage */ - { -- .ctl_name = 4, -+ .ctl_name = UNNUMBERED_OR_VAL(4), - .procname = "reclaim-percentage", - .maxlen = sizeof(int), - .mode = 0644, -@@ -343,15 +352,15 @@ - static int ncache_perf_count = PVFS2_PERF_COUNT_REQUEST_NCACHE; - static ctl_table pvfs2_pc_table[] = { - { -- .ctl_name = 1, -+ .ctl_name = UNNUMBERED_OR_VAL(1), - .procname = "acache", - .maxlen = 4096, - .mode = 0444, - .proc_handler = pvfs2_pc_proc_handler, - .extra1 = &acache_perf_count, - }, - { -- .ctl_name = 2, -+ .ctl_name = UNNUMBERED_OR_VAL(2), - .procname = "ncache", - .maxlen = 4096, - .mode = 0444, -@@ -366,44 +375,44 @@ - static ctl_table pvfs2_stats_table[] = { - /* shows number of hits in cache */ - { -- .ctl_name = 1, -+ .ctl_name = UNNUMBERED_OR_VAL(1), - .procname = "hits", - .data = &g_pvfs2_stats.cache_hits, - .maxlen = sizeof(unsigned long), - .mode = 0444, - .proc_handler = &proc_dointvec, - }, - { -- .ctl_name = 2, -+ .ctl_name = UNNUMBERED_OR_VAL(2), - .procname = "misses", - .data = &g_pvfs2_stats.cache_misses, - .maxlen = sizeof(unsigned long), - .mode = 0444, - .proc_handler = &proc_dointvec, - }, - { -- .ctl_name = 3, -+ .ctl_name = UNNUMBERED_OR_VAL(3), - .procname = "reads", - .data = &g_pvfs2_stats.reads, - .maxlen = sizeof(unsigned long), - .mode = 0444, - .proc_handler = &proc_dointvec, - }, - { -- .ctl_name = 4, -+ .ctl_name = UNNUMBERED_OR_VAL(4), - .procname = "writes", - .data = &g_pvfs2_stats.writes, - .maxlen = sizeof(unsigned long), - .mode = 0444, - .proc_handler = &proc_dointvec, - }, -- {.ctl_name = 0}, -+ {0} - }; - - static ctl_table pvfs2_table[] = { - /* controls debugging level */ - { -- .ctl_name = 1, -+ .ctl_name = UNNUMBERED_OR_VAL(1), - .procname = "debug", - .data = &gossip_debug_mask, - .maxlen = sizeof(int), -@@ -415,7 +424,7 @@ - }, - /* operation timeout */ - { -- .ctl_name = 2, -+ .ctl_name = UNNUMBERED_OR_VAL(2), - .procname = "op-timeout-secs", - .data = &op_timeout_secs, - .maxlen = sizeof(int), -@@ -427,7 +436,7 @@ - }, - /* time interval for client side performance counters */ - { -- .ctl_name = 3, -+ .ctl_name = UNNUMBERED_OR_VAL(3), - .procname = "perf-time-interval-secs", - .maxlen = sizeof(int), - .mode = 0644, -@@ -436,7 +445,7 @@ - }, - /* time interval for client side performance counters */ - { -- .ctl_name = 4, -+ .ctl_name = UNNUMBERED_OR_VAL(4), - .procname = "perf-history-size", - .maxlen = sizeof(int), - .mode = 0644, -@@ -445,7 +454,7 @@ - }, - /* reset performance counters */ - { -- .ctl_name = 5, -+ .ctl_name = UNNUMBERED_OR_VAL(5), - .procname = "perf-counter-reset", - .maxlen = sizeof(int), - .mode = 0644, -@@ -454,30 +463,30 @@ - }, - /* subdir for acache control */ - { -- .ctl_name = 6, -+ .ctl_name = UNNUMBERED_OR_VAL(6), - .procname = "acache", - .maxlen = 0, - .mode = 0555, - .child = pvfs2_acache_table - }, - { -- .ctl_name = 7, -+ .ctl_name = UNNUMBERED_OR_VAL(7), - .procname = "perf-counters", - .maxlen = 0, - .mode = 0555, - .child = pvfs2_pc_table - }, - /* subdir for ncache control */ - { -- .ctl_name = 8, -+ .ctl_name = UNNUMBERED_OR_VAL(8), - .procname = "ncache", - .maxlen = 0, - .mode = 0555, - .child = pvfs2_ncache_table - }, - /* statistics maintained by the kernel module (output only below this) */ - { -- .ctl_name = 9, -+ .ctl_name = UNNUMBERED_OR_VAL(9), - .procname = "stats", - .maxlen = 0, - .mode = 0555, -@@ -487,7 +496,7 @@ - }; - static ctl_table fs_table[] = { - { -- .ctl_name = 1, -+ .ctl_name = UNNUMBERED_OR_VAL(1), - .procname = "pvfs2", - .mode = 0555, - .child = pvfs2_table diff --git a/sys-cluster/pvfs2/files/2.7.0-gentoo-makefile.patch b/sys-cluster/pvfs2/files/2.7.0-gentoo-makefile.patch deleted file mode 100644 index 0e277e14cbba..000000000000 --- a/sys-cluster/pvfs2/files/2.7.0-gentoo-makefile.patch +++ /dev/null @@ -1,198 +0,0 @@ -diff -urN pvfs-2.7.0/Makefile.in pvfs-2.7.0_patched/Makefile.in ---- pvfs-2.7.0/Makefile.in 2008-02-28 10:27:37.000000000 -0500 -+++ pvfs-2.7.0_patched/Makefile.in 2008-02-28 10:27:35.000000000 -0500 -@@ -52,10 +52,14 @@ - # define a few generic variables that we need to use - DESTDIR = - srcdir = @srcdir@ --prefix = $(DESTDIR)@prefix@ -+prefix = @prefix@ - datarootdir = $(DESTDIR)@datarootdir@ - mandir = $(DESTDIR)@mandir@ --exec_prefix = $(DESTDIR)@exec_prefix@ -+exec_prefix = @exec_prefix@ -+sbindir = $(DESTDIR)@sbindir@ -+bindir = $(DESTDIR)@bindir@ -+libdir = $(DESTDIR)@libdir@ -+includedir = $(DESTDIR)@includedir@ - - VPATH = $(srcdir) - SHELL = @SHELL@ -@@ -63,6 +67,7 @@ - # TODO: should probably check for bison and flex in configure - BISON = bison - FLEX = flex -+LN_S = ln -s - BUILD_BMI_TCP = @BUILD_BMI_TCP@ - BUILD_GM = @BUILD_GM@ - BUILD_MX = @BUILD_MX@ -@@ -162,6 +167,9 @@ - REDHAT_RELEASE = @REDHAT_RELEASE@ - NPTL_WORKAROUND = @NPTL_WORKAROUND@ - STRICT_CFLAGS = @STRICT_CFLAGS@ -+SO_FULL = 2.0.0 -+SO_MAJOR = 2 -+ - # for Solaris: - # LIBS += -lsocket -lnsl - -@@ -435,8 +443,10 @@ - LIBRARIES := - LIBRARIES_THREADED := - ifeq ($(build_shared),yes) --LIBRARIES_SHARED = lib/libpvfs2.so -+LIBRARIES_SHARED = lib/libpvfs2.so.$(SO_FULL) - LIBRARIES += $(LIBRARIES_SHARED) -+LIBRARIES_THREADED_SHARED = lib/libpvfs2-threaded.so.$(SO_FULL) -+LIBRARIES_THREADED += $(LIBRARIES_THREADED_SHARED) - endif - ifeq ($(build_static),yes) - LIBRARIES_STATIC = lib/libpvfs2.a -@@ -627,16 +637,16 @@ - $(E)ar rcs $@ $(LIBTHREADEDOBJS) - - # rule for building the pvfs2 library --lib/libpvfs2.so: $(LIBPICOBJS) -+lib/libpvfs2.so.$(SO_FULL): $(LIBPICOBJS) - $(Q) " LDSO $@" - $(E)$(INSTALL) -d lib -- $(E)$(LDSHARED) -o $@ $(LIBPICOBJS) -+ $(E)$(LDSHARED) -Wl,-soname,libpvfs2.so -o $@ $(LIBPICOBJS) - - # rule for building the pvfs2 _multithreaded_ library --lib/libpvfs2-threaded.so: $(LIBTHREADEDPICOBJS) -+lib/libpvfs2-threaded.so.$(SO_FULL): $(LIBTHREADEDPICOBJS) - $(Q) " LDSO $@" - $(E)$(INSTALL) -d lib -- $(E)$(LDSHARED) -o $@ $(LIBTHREADEDPICOBJS) -+ $(E)$(LDSHARED) -Wl,-soname,libpvfs2-threaded.so -o $@ $(LIBTHREADEDPICOBJS) - - # rule for building the pvfs2 server library - lib/libpvfs2-server.a: $(SERVEROBJS) -@@ -713,7 +723,7 @@ - - # all applications depend on the pvfs2 library - $(ADMINTOOLS): %: %.o $(LIBRARIES) --$(ADMINTOOLS_SERVER): %: %.o $(LIBRARIES) lib/libpvfs2-server.a -+$(ADMINTOOLS_SERVER): %: %.o $(LIBRARIES) - $(KERNAPPS): %: %.o $(LIBRARIES) - $(KERNAPPSTHR): %: %.o $(LIBRARIES_THREADED) - -@@ -769,7 +779,7 @@ - $(E)rm -f $(LIBOBJS) $(LIBTHREADEDOBJS) $(SERVEROBJS) $(MISCOBJS) \ - $(LIBRARIES) $(LIBRARIES_THREADED) $(DEPENDS) $(SERVER) \ - $(ADMINOBJS) $(ADMINOBJS_SERVER) $(ADMINTOOLS)\ -- $(ADMINTOOLS_SERVER) lib/libpvfs2-server.a\ -+ $(ADMINTOOLS_SERVER) \ - $(KERNAPPOBJS) $(KERNAPPS) $(KERNAPPSTHR) \ - $(VISS) $(VISMISCOBJS) $(VISOBJS) $(VISDEPENDS)\ - $(VISMISCDEPENDS) $(KARMAOBJS) $(LIBPICOBJS) \ -@@ -883,43 +893,48 @@ - install -m 644 $(srcdir)/doc/man/*.5 $(mandir)/man5 - - install:: all install_doc -- install -d $(prefix)/include -- install -m 644 $(srcdir)/include/pvfs2.h $(prefix)/include -- install -m 644 $(srcdir)/include/pvfs2-request.h $(prefix)/include -- install -m 644 $(srcdir)/include/pvfs2-debug.h $(prefix)/include -- install -m 644 $(srcdir)/include/pvfs2-sysint.h $(prefix)/include -- install -m 644 $(srcdir)/include/pvfs2-mgmt.h $(prefix)/include -- install -m 644 $(srcdir)/include/pvfs2-types.h $(prefix)/include -- install -m 644 $(srcdir)/include/pvfs2-util.h $(prefix)/include -- install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(prefix)/include -- -- install -d $(prefix)/lib -- install -m 755 $(LIBRARIES) $(prefix)/lib -+ install -d $(includedir) -+ install -m 644 $(srcdir)/include/pvfs2.h $(includedir) -+ install -m 644 $(srcdir)/include/pvfs2-request.h $(includedir) -+ install -m 644 $(srcdir)/include/pvfs2-debug.h $(includedir) -+ install -m 644 $(srcdir)/include/pvfs2-sysint.h $(includedir) -+ install -m 644 $(srcdir)/include/pvfs2-mgmt.h $(includedir) -+ install -m 644 $(srcdir)/include/pvfs2-types.h $(includedir) -+ install -m 644 $(srcdir)/include/pvfs2-util.h $(includedir) -+ install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(includedir) -+ -+ install -d $(libdir) -+ install -m 755 $(LIBRARIES) $(libdir) -+ install -m 755 $(LIBRARIES_THREADED) $(libdir) -+ $(LN_S) libpvfs2-threaded.so.$(SO_FULL) $(libdir)/libpvfs2-threaded.so.$(SO_MAJOR) -+ $(LN_S) libpvfs2-threaded.so.$(SO_FULL) $(libdir)/libpvfs2-threaded.so -+ $(LN_S) libpvfs2.so.$(SO_FULL) $(libdir)/libpvfs2.so.$(SO_MAJOR) -+ $(LN_S) libpvfs2.so.$(SO_FULL) $(libdir)/libpvfs2.so - - ifdef TARGET_OS_DARWIN - # TOC needs to be regenerated in libs after they get moved - ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES)) - endif - -- install -d $(prefix)/bin -- install -m 755 $(ADMINTOOLS) $(prefix)/bin -- install -m 755 src/apps/admin/pvfs2-config $(prefix)/bin -+ install -d $(bindir) -+ install -m 755 $(ADMINTOOLS) $(bindir) -+ install -m 755 src/apps/admin/pvfs2-config $(bindir) - @# if we ever auto-generate genconfig, remove the $(srcdir) -- install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(prefix)/bin -- install -m 755 $(srcdir)/src/apps/admin/pvfs2-config-convert $(prefix)/bin -+ install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(bindir) -+ install -m 755 $(srcdir)/src/apps/admin/pvfs2-config-convert $(bindir) - ifdef BUILD_KARMA -- install -m 755 $(KARMA) $(prefix)/bin -+ install -m 755 $(KARMA) $(bindir) - endif - -- install -d $(prefix)/sbin -+ install -d $(sbindir) - - ifdef BUILD_SERVER -- install -m 755 $(ADMINTOOLS_SERVER) $(prefix)/bin -+ install -m 755 $(ADMINTOOLS_SERVER) $(bindir) - ifeq ($(NPTL_WORKAROUND),) -- install -m 755 $(SERVER) $(prefix)/sbin -+ install -m 755 $(SERVER) $(sbindir) - else -- install -m 755 $(srcdir)/$(SERVER_STUB) $(prefix)/sbin/pvfs2-server -- install -m 755 $(SERVER) $(prefix)/sbin/pvfs2-server.bin -+ install -m 755 $(srcdir)/$(SERVER_STUB) $(sbindir)/pvfs2-server -+ install -m 755 $(SERVER) $(sbindir)/pvfs2-server.bin - endif - endif - -@@ -939,9 +954,12 @@ - install -m 755 src/kernel/linux-2.6/pvfs2.ko $(KMOD_DIR) - - .PHONY: kmod_install --kmod_install: kmod kernapps just_kmod_install -- install -d $(prefix)/sbin -- install -m 755 $(KERNAPPS) $(prefix)/sbin -+kmod_install: kmod kernapps_install just_kmod_install -+ -+.PHONY: kernapps_install -+kernapps_install: kernapps -+ install -d $(sbindir) -+ install -m 755 $(KERNAPPS) $(sbindir) - endif - - ifneq (,$(LINUX24_KERNEL_SRC)) -@@ -960,12 +978,15 @@ - install -m 755 src/kernel/linux-2.4/pvfs2.o $(KMOD_DIR) - - .PHONY: kmod24_install --kmod24_install: kmod24 kernapps just_kmod24_install -- install -d $(prefix)/sbin -- install -m 755 $(KERNAPPS) $(prefix)/sbin -- install -m 755 src/apps/kernel/linux/mount.pvfs2 $(prefix)/sbin -+kmod24_install: kmod24 kernapps_install just_kmod24_install -+ -+.PHONY: kernapps_install -+kernapps_install: kernapps -+ install -d $(sbindir) -+ install -m 755 $(KERNAPPS) $(sbindir) -+ install -m 755 src/apps/kernel/linux/mount.pvfs2 $(sbindir) - @echo "" - @echo "For improved linux-2.4 support," -- @echo "install $(prefix)/sbin/mount.pvfs2 to /sbin/mount.pvfs2" -+ @echo "install $(sbindir)/mount.pvfs2 to /sbin/mount.pvfs2" - @echo "" - endif diff --git a/sys-cluster/pvfs2/files/2.7.0-kernel-rt.patch b/sys-cluster/pvfs2/files/2.7.0-kernel-rt.patch deleted file mode 100644 index 2b67ff9fd987..000000000000 --- a/sys-cluster/pvfs2/files/2.7.0-kernel-rt.patch +++ /dev/null @@ -1,88 +0,0 @@ -Index: pvfs2-config.h.in -=================================================================== -RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v -diff -u -N -r1.111 -r1.112 ---- pvfs2-config.h.in 5 Nov 2007 21:07:54 -0000 1.111 -+++ pvfs2-config.h.in 7 Dec 2007 23:05:56 -0000 1.112 -@@ -198,6 +198,9 @@ - /* Define to 1 if you have the <malloc.h> header file. */ - #undef HAVE_MALLOC_H - -+/* Define if kernel defines mapping_nrpages macro -- defined by RT linux */ -+#undef HAVE_MAPPING_NRPAGES_MACRO -+ - /* Define to 1 if you have the <memory.h> header file. */ - #undef HAVE_MEMORY_H - -@@ -258,6 +261,10 @@ - /* Define if kernel has register_ioctl32_conversion */ - #undef HAVE_REGISTER_IOCTL32_CONVERSION - -+/* Define if kernel address_space struct has a spin_lock for private data -+ instead of rw_lock -- used by RT linux */ -+#undef HAVE_RT_PRIV_LOCK_ADDR_SPACE_STRUCT -+ - /* Define to 1 if you have the <SDL/SDL_ttf.h> header file. */ - #undef HAVE_SDL_SDL_TTF_H - -@@ -273,6 +280,9 @@ - /* Define if SLAB_KERNEL is defined in kernel */ - #undef HAVE_SLAB_KERNEL - -+/* Define if kernel address_space struct has a spin_lock instead of rw_lock */ -+#undef HAVE_SPIN_LOCK_ADDR_SPACE_STRUCT -+ - /* Define if struct super_operations in kernel has statfs_lite callback */ - #undef HAVE_STATFS_LITE_SUPER_OPERATIONS - -Index: maint/config/kernel.m4 -=================================================================== -RCS file: /projects/cvsroot/pvfs2/maint/config/kernel.m4,v -diff -u -N -r1.46 -r1.47 ---- maint/config/kernel.m4 6 Nov 2007 16:29:52 -0000 1.46 -+++ maint/config/kernel.m4 7 Dec 2007 23:05:56 -0000 1.47 -@@ -849,5 +849,44 @@ - AC_MSG_RESULT(no) - ) - -+ AC_MSG_CHECKING(if kernel address_space struct has a spin_lock field) -+ AC_TRY_COMPILE([ -+ #define __KERNEL__ -+ #include <linux/fs.h> -+ ], [ -+ struct address_space as; -+ spin_lock(&as.page_lock); -+ ], -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_SPIN_LOCK_ADDR_SPACE_STRUCT, 1, [Define if kernel address_space struct has a spin_lock instead of rw_lock]), -+ AC_MSG_RESULT(no) -+ ) -+ -+ AC_MSG_CHECKING(if kernel address_space struct has a priv_lock field - from RT linux) -+ AC_TRY_COMPILE([ -+ #define __KERNEL__ -+ #include <linux/fs.h> -+ ], [ -+ struct address_space as; -+ spin_lock(&as.priv_lock); -+ ], -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_RT_PRIV_LOCK_ADDR_SPACE_STRUCT, 1, [Define if kernel address_space struct has a spin_lock for private data instead of rw_lock -- used by RT linux]), -+ AC_MSG_RESULT(no) -+ ) -+ -+ AC_MSG_CHECKING(if kernel defines mapping_nrpages macro - from RT linux) -+ AC_TRY_COMPILE([ -+ #define __KERNEL__ -+ #include <linux/fs.h> -+ ], [ -+ struct address_space idata; -+ int i = mapping_nrpages(&idata); -+ ], -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_MAPPING_NRPAGES_MACRO, 1, [Define if kernel defines mapping_nrpages macro -- defined by RT linux]), -+ AC_MSG_RESULT(no) -+ ) -+ - CFLAGS=$oldcflags - ]) diff --git a/sys-cluster/pvfs2/files/2.7.0-kmem_cache.patch b/sys-cluster/pvfs2/files/2.7.0-kmem_cache.patch deleted file mode 100644 index e91a5d51f128..000000000000 --- a/sys-cluster/pvfs2/files/2.7.0-kmem_cache.patch +++ /dev/null @@ -1,127 +0,0 @@ -Index: pvfs2-config.h.in -=================================================================== -RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v -diff -u -r1.113 -r1.114 ---- pvfs2-config.h.in 11 Jan 2008 15:00:08 -0000 1.113 -+++ pvfs2-config.h.in 11 Jan 2008 20:30:17 -0000 1.114 -@@ -159,6 +159,10 @@ - /* Define if kernel lacks device classes */ - #undef HAVE_KERNEL_DEVICE_CLASSES - -+/* Define if kernel kmem_cache_create constructor has new-style two-parameter -+ form */ -+#undef HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM -+ - /* Define if kernel kmem_cache_create has destructor param */ - #undef HAVE_KMEM_CACHE_CREATE_DESTRUCTOR_PARAM - -Index: maint/config/kernel.m4 -=================================================================== -RCS file: /projects/cvsroot/pvfs2/maint/config/kernel.m4,v -diff -u -r1.50 -r1.51 ---- maint/config/kernel.m4 11 Jan 2008 20:07:20 -0000 1.50 -+++ maint/config/kernel.m4 11 Jan 2008 20:30:16 -0000 1.51 -@@ -126,6 +126,7 @@ - AC_MSG_CHECKING(for struct kmem_cache in kernel) - AC_TRY_COMPILE([ - #define __KERNEL__ -+ #include <linux/kernel.h> - #include <linux/slab.h> - - int foo(struct kmem_cache *s) -@@ -866,6 +865,32 @@ - AC_MSG_RESULT(no) - ) - -+ dnl 2.6.24 changed the constructor parameter signature of -+ dnl kmem_cache_create. Check for this newer two-param style and -+ dnl if not, assume it is old. Note we can get away with just -+ dnl struct kmem_cache (and not kmem_cache_t) as that change happened -+ dnl in older kernels. If they don't match, gcc complains about -+ dnl passing argument ... from incompatible pointer type, hence the -+ dnl need for the -Werror. -+ tmp_cflags=$CFLAGS -+ CFLAGS="$CFLAGS -Werror" -+ AC_MSG_CHECKING(for two-param kmem_cache_create constructor) -+ AC_TRY_COMPILE([ -+ #define __KERNEL__ -+ #include <linux/kernel.h> -+ #include <linux/slab.h> -+ void ctor(struct kmem_cache *cachep, void *req) -+ { -+ } -+ ], [ -+ kmem_cache_create("config-test", 0, 0, 0, ctor); -+ ], -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM, 1, [Define if kernel kmem_cache_create constructor has new-style two-parameter form]), -+ AC_MSG_RESULT(no) -+ ) -+ CFLAGS=$tmp_cflags -+ - AC_MSG_CHECKING(if kernel address_space struct has a spin_lock field named page_lock) - AC_TRY_COMPILE([ - #define __KERNEL__ -Index: src/kernel/linux-2.6/pvfs2-cache.c -=================================================================== -RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/pvfs2-cache.c,v -diff -u -r1.44 -r1.45 ---- src/kernel/linux-2.6/pvfs2-cache.c 4 Nov 2007 01:38:57 -0000 1.44 -+++ src/kernel/linux-2.6/pvfs2-cache.c 11 Jan 2008 20:30:17 -0000 1.45 -@@ -202,10 +202,17 @@ - } - } - -+ - static void dev_req_cache_ctor( -+#ifdef HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM -+ struct kmem_cache *cachep, -+ void *req -+#else - void *req, - pvfs2_kmem_cache_t * cachep, -- unsigned long flags) -+ unsigned long flags -+#endif -+) - { - memset(req, 0, sizeof(MAX_ALIGNED_DEV_REQ_DOWNSIZE)); - } -@@ -264,11 +271,17 @@ - } - - static void pvfs2_inode_cache_ctor( -- void *new_pvfs2_inode, -+#ifdef HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM -+ struct kmem_cache *cachep, -+ void *req -+#else -+ void *req, - pvfs2_kmem_cache_t * cachep, -- unsigned long flags) -+ unsigned long flags -+#endif -+) - { -- pvfs2_inode_t *pvfs2_inode = (pvfs2_inode_t *)new_pvfs2_inode; -+ pvfs2_inode_t *pvfs2_inode = req; - - memset(pvfs2_inode, 0, sizeof(pvfs2_inode_t)); - ClearInitFlag(pvfs2_inode); -@@ -382,9 +395,15 @@ - #ifdef HAVE_AIO_VFS_SUPPORT - - static void kiocb_ctor( -+#ifdef HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM -+ struct kmem_cache *cachep, -+ void *req -+#else - void *req, - pvfs2_kmem_cache_t * cachep, -- unsigned long flags) -+ unsigned long flags -+#endif -+) - { - memset(req, 0, sizeof(pvfs2_kiocb)); - } diff --git a/sys-cluster/pvfs2/files/2.7.0-verbose-checking.patch b/sys-cluster/pvfs2/files/2.7.0-verbose-checking.patch deleted file mode 100644 index d02eb7554b60..000000000000 --- a/sys-cluster/pvfs2/files/2.7.0-verbose-checking.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: maint/config/kernel.m4 -=================================================================== -RCS file: /projects/cvsroot/pvfs2/maint/config/kernel.m4,v -diff -u -N -r1.48 -r1.49 ---- maint/config/kernel.m4 11 Jan 2008 15:00:08 -0000 1.48 -+++ maint/config/kernel.m4 11 Jan 2008 15:02:14 -0000 1.49 -@@ -849,7 +849,7 @@ - AC_MSG_RESULT(no) - ) - -- AC_MSG_CHECKING(if kernel address_space struct has a spin_lock field) -+ AC_MSG_CHECKING(if kernel address_space struct has a spin_lock field named page_lock) - AC_TRY_COMPILE([ - #define __KERNEL__ - #include <linux/fs.h> diff --git a/sys-cluster/pvfs2/files/pvfs2-2.7.1-2.6.29-fixes.patch b/sys-cluster/pvfs2/files/pvfs2-2.7.1-2.6.29-fixes.patch deleted file mode 100644 index 7c6c7dc24fc5..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-2.7.1-2.6.29-fixes.patch +++ /dev/null @@ -1,235 +0,0 @@ -From a23f33d2a86735194b42e3f84f2fbfb7e7d9e9df Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Sun, 27 Sep 2009 09:49:42 -0400 -Subject: [PATCH] 2.6.29 fixes. - -Backport of: -http://www.pvfs.org/fisheye/changelog/PVFS/?cs=MAIN:pcarns:20090401212735 -http://www.pvfs.org/fisheye/changelog/PVFS/?cs=MAIN:pcarns:20090401202748 ---- - maint/config/kernel.m4 | 21 ++++++++++++++++++++- - pvfs2-config.h.in | 3 +++ - src/kernel/linux-2.6/acl.c | 21 ++++++++++++++++----- - src/kernel/linux-2.6/inode.c | 5 +++++ - src/kernel/linux-2.6/pvfs2-kernel.h | 13 +++++++++++++ - src/kernel/linux-2.6/pvfs2-utils.c | 16 +++++++++++++++- - 6 files changed, 72 insertions(+), 7 deletions(-) - -diff --git a/maint/config/kernel.m4 b/maint/config/kernel.m4 -index 15123de..4e2abc4 100644 ---- a/maint/config/kernel.m4 -+++ b/maint/config/kernel.m4 -@@ -20,7 +20,7 @@ AC_DEFUN([AX_KERNEL_FEATURES], - dnl we probably need additional includes if this build is intended - dnl for a different architecture - if test -n "${ARCH}" ; then -- CFLAGS="$CFLAGS -I$lk_src/arch/${ARCH}/include" -+ CFLAGS="$CFLAGS -I$lk_src/arch/${ARCH}/include -I$lk_src/arch/${ARCH}/include/asm/mach-default" - fi - - AC_MSG_CHECKING(for i_size_write in kernel) -@@ -985,5 +985,24 @@ AC_DEFUN([AX_KERNEL_FEATURES], - AC_MSG_RESULT(no) - ) - -+ dnl newer 2.6 kernels (2.6.29-ish) use current_fsuid() macro instead -+ dnl of accessing task struct fields directly -+ tmp_cflags=$CFLAGS -+ CFLAGS="$CFLAGS -Werror" -+ AC_MSG_CHECKING(for current_fsuid) -+ AC_TRY_COMPILE([ -+ #define __KERNEL__ -+ #include <linux/sched.h> -+ #include <linux/cred.h> -+ ], [ -+ int uid = current_fsuid(); -+ ], -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_CURRENT_FSUID, 1, [Define if cred.h contains current_fsuid]), -+ AC_MSG_RESULT(no) -+ ) -+ CFLAGS=$tmp_cflags -+ -+ - CFLAGS=$oldcflags - ]) -diff --git a/pvfs2-config.h.in b/pvfs2-config.h.in -index e08a89d..de97472 100644 ---- a/pvfs2-config.h.in -+++ b/pvfs2-config.h.in -@@ -43,6 +43,9 @@ - /* Define if third param (message) to DB error callback function is const */ - #undef HAVE_CONST_THIRD_PARAMETER_TO_DB_ERROR_CALLBACK - -+/* Define if cred.h contains current_fsuid */ -+#undef HAVE_CURRENT_FSUID -+ - /* Define if DB error callback function takes dbenv parameter */ - #undef HAVE_DBENV_PARAMETER_TO_DB_ERROR_CALLBACK - -diff --git a/src/kernel/linux-2.6/acl.c b/src/kernel/linux-2.6/acl.c -index 252a445..290851b 100644 ---- a/src/kernel/linux-2.6/acl.c -+++ b/src/kernel/linux-2.6/acl.c -@@ -409,6 +409,11 @@ pvfs2_xattr_set_acl(struct inode *inode, int type, const void *value, - { - struct posix_acl *acl; - int error; -+#ifdef HAVE_CURRENT_FSUID -+ int fsuid = current_fsuid(); -+#else -+ int fsuid = current->fsuid; -+#endif - - gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_xattr_set_acl called with size %ld\n", - (long)size); -@@ -420,11 +425,11 @@ pvfs2_xattr_set_acl(struct inode *inode, int type, const void *value, - return -EOPNOTSUPP; - } - /* Are we capable of setting acls on a file for which we should not be? */ -- if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) -+ if ((fsuid != inode->i_uid) && !capable(CAP_FOWNER)) - { - gossip_err("pvfs2_xattr_set_acl: operation not permitted " - "(current->fsuid %d), (inode->owner %d)\n", -- current->fsuid, inode->i_uid); -+ fsuid, inode->i_uid); - return -EPERM; - } - if (value) -@@ -673,6 +678,12 @@ static int pvfs2_check_acl(struct inode *inode, int mask) - - int pvfs2_permission(struct inode *inode, int mask, struct nameidata *nd) - { -+#ifdef HAVE_CURRENT_FSUID -+ int fsuid = current_fsuid(); -+#else -+ int fsuid = current->fsuid; -+#endif -+ - #ifdef HAVE_GENERIC_PERMISSION - int ret; - -@@ -684,7 +695,7 @@ int pvfs2_permission(struct inode *inode, int mask, struct nameidata *nd) - "inode->i_uid = %d, inode->i_gid = %d " - "in_group_p = %d " - "(ret = %d)\n", -- llu(get_handle_from_ino(inode)), mask, inode->i_mode, current->fsuid, -+ llu(get_handle_from_ino(inode)), mask, inode->i_mode, fsuid, - inode->i_uid, inode->i_gid, - in_group_p(inode->i_gid), - ret); -@@ -709,7 +720,7 @@ int pvfs2_permission(struct inode *inode, int mask, struct nameidata *nd) - "mode = %o current->fsuid = %d " - "inode->i_uid = %d, inode->i_gid = %d" - "in_group_p = %d\n", -- llu(get_handle_from_ino(inode)), mask, mode, current->fsuid, -+ llu(get_handle_from_ino(inode)), mask, mode, fsuid, - inode->i_uid, inode->i_gid, - in_group_p(inode->i_gid)); - -@@ -727,7 +738,7 @@ int pvfs2_permission(struct inode *inode, int mask, struct nameidata *nd) - gossip_err("pvfs2_permission: cannot write to an immutable file!\n"); - return -EACCES; - } -- if (current->fsuid == inode->i_uid) -+ if (fsuid == inode->i_uid) - { - mode >>= 6; - } -diff --git a/src/kernel/linux-2.6/inode.c b/src/kernel/linux-2.6/inode.c -index 9a38f59..8651f29 100644 ---- a/src/kernel/linux-2.6/inode.c -+++ b/src/kernel/linux-2.6/inode.c -@@ -532,8 +532,13 @@ struct inode *pvfs2_get_custom_inode_common( - "pvfs2_get_custom_inode_common: inode: %p, inode->i_mode %o\n", - inode, inode->i_mode); - inode->i_mapping->host = inode; -+#ifdef HAVE_CURRENT_FSUID -+ inode->i_uid = current_fsuid(); -+ inode->i_gid = current_fsgid(); -+#else - inode->i_uid = current->fsuid; - inode->i_gid = current->fsgid; -+#endif - inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; - inode->i_size = PAGE_CACHE_SIZE; - #ifdef HAVE_I_BLKSIZE_IN_STRUCT_INODE -diff --git a/src/kernel/linux-2.6/pvfs2-kernel.h b/src/kernel/linux-2.6/pvfs2-kernel.h -index ca3b10b..0beb386 100644 ---- a/src/kernel/linux-2.6/pvfs2-kernel.h -+++ b/src/kernel/linux-2.6/pvfs2-kernel.h -@@ -1162,6 +1162,18 @@ static inline struct dentry* pvfs2_d_splice_alias(struct dentry *dentry, struct - return d_splice_alias(inode, dentry); - } - -+#ifdef HAVE_CURRENT_FSUID -+#define fill_default_sys_attrs(sys_attr,type,mode)\ -+do \ -+{ \ -+ sys_attr.owner = current_fsuid(); \ -+ sys_attr.group = current_fsgid(); \ -+ sys_attr.size = 0; \ -+ sys_attr.perms = PVFS_util_translate_mode(mode,0); \ -+ sys_attr.objtype = type; \ -+ sys_attr.mask = PVFS_ATTR_SYS_ALL_SETABLE; \ -+} while(0) -+#else - #define fill_default_sys_attrs(sys_attr,type,mode)\ - do \ - { \ -@@ -1172,6 +1184,7 @@ do \ - sys_attr.objtype = type; \ - sys_attr.mask = PVFS_ATTR_SYS_ALL_SETABLE; \ - } while(0) -+#endif /* HAVE_CURRENT_FSUID */ - - #endif /* PVFS2_LINUX_KERNEL_2_4 */ - -diff --git a/src/kernel/linux-2.6/pvfs2-utils.c b/src/kernel/linux-2.6/pvfs2-utils.c -index 380df79..ec35ceb 100644 ---- a/src/kernel/linux-2.6/pvfs2-utils.c -+++ b/src/kernel/linux-2.6/pvfs2-utils.c -@@ -19,8 +19,13 @@ int pvfs2_gen_credentials( - if (credentials) - { - memset(credentials, 0, sizeof(PVFS_credentials)); -+#ifdef HAVE_CURRENT_FSUID -+ credentials->uid = current_fsuid(); -+ credentials->gid = current_fsgid(); -+#else - credentials->uid = current->fsuid; - credentials->gid = current->fsgid; -+#endif - - ret = 0; - } -@@ -716,6 +721,7 @@ ssize_t pvfs2_inode_getxattr(struct inode *inode, const char* prefix, - pvfs2_kernel_op_t *new_op = NULL; - pvfs2_inode_t *pvfs2_inode = NULL; - ssize_t length = 0; -+ int fsuid, fsgid; - - if (name == NULL || (size > 0 && buffer == NULL)) - { -@@ -730,8 +736,16 @@ ssize_t pvfs2_inode_getxattr(struct inode *inode, const char* prefix, - } - if (inode) - { -+#ifdef HAVE_CURRENT_FSUID -+ fsuid = current_fsuid(); -+ fsgid = current_fsgid(); -+#else -+ fsuid = current->fsuid; -+ fsgid = current->fsgid; -+#endif -+ - gossip_debug(GOSSIP_XATTR_DEBUG, "getxattr on inode %llu, name %s (uid %o, gid %o)\n", -- llu(get_handle_from_ino(inode)), name, current->fsuid, current->fsgid); -+ llu(get_handle_from_ino(inode)), name, fsuid, fsgid); - pvfs2_inode = PVFS2_I(inode); - /* obtain the xattr semaphore */ - down_read(&pvfs2_inode->xattr_sem); --- -1.6.3.3 - diff --git a/sys-cluster/pvfs2/files/pvfs2-2.7.1-2.6.30-fixes.patch b/sys-cluster/pvfs2/files/pvfs2-2.7.1-2.6.30-fixes.patch deleted file mode 100644 index 7615815be02c..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-2.7.1-2.6.30-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dda026a81c36cdf6fe384f83601f3aa69044d3e3 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Sun, 27 Sep 2009 09:58:17 -0400 -Subject: [PATCH] 2.6.30 fixes. - -Backport: -http://www.pvfs.org/fisheye/changelog/PVFS/src/kernel?cs=MAIN:pcarns:20090630184815 ---- - src/kernel/linux-2.6/acl.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/kernel/linux-2.6/acl.c b/src/kernel/linux-2.6/acl.c -index 290851b..0b1f529 100644 ---- a/src/kernel/linux-2.6/acl.c -+++ b/src/kernel/linux-2.6/acl.c -@@ -31,6 +31,7 @@ - #include <linux/xattr_acl.h> - #endif - #include "bmi-byteswap.h" -+#include <linux/fs_struct.h> - - /* - * Encoding and Decoding the extended attributes so that we can --- -1.6.3.3 - diff --git a/sys-cluster/pvfs2/files/pvfs2-client-conf.d-2.7.0 b/sys-cluster/pvfs2/files/pvfs2-client-conf.d-2.7.0 deleted file mode 100644 index 0aa784595582..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-client-conf.d-2.7.0 +++ /dev/null @@ -1,18 +0,0 @@ -# Extra arguments to supply to the pvfs2-client daemon -#PVFS2_CLIENT_ARGS="-L /var/log/pvfs2-client.log" - -# Location of the pvfs2-client binaries. Defaults are shown -PVFS2_CLIENT="/usr/sbin/pvfs2-client" -PVFS2_CLIENT_CORE="/usr/sbin/pvfs2-client-core" - -# Location to store pid -PVFS2_CLIENT_PIDFILE="/var/run/pvfs2-client.pid" - -# List of server:mountpoint to automatically mount when the -# init script is run. If some other mechanism is used to do -# the mounting, then this can be left commented out. -# 3334 is the default port for pvfs2. -# <host>:<port>,<mount_point> -#PVFS2_MOUNTS="servera.tld:3334,/pvfs serverb.tld:3334,/other/pvfs" - - diff --git a/sys-cluster/pvfs2/files/pvfs2-client-init.d b/sys-cluster/pvfs2/files/pvfs2-client-init.d deleted file mode 100644 index 8ed8eea751ec..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-client-init.d +++ /dev/null @@ -1,76 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-client-init.d,v 1.1 2007/10/05 14:03:13 mabi Exp $ - - -depend() { - need net - need localmount - before pbs_mom - after pvfs2-server -} - -checkconfig() { - if [ ! -x "${PVFS2_CLIENT}" ] || [ ! -x "${PVFS2_CLIENT_CORE}" ]; then - eend 1 "pvfs-2 was not correctly installed." - return 1 - fi - - if [ ! -d "${PVFS2_MOUNTPOINT}" ]; then - ewarn "Creating ${PVFS2_MOUNTPOINT}" - mkdir -p ${PVFS2_MOUNTPOINT} || return 1 - fi - - local piddir=$(dirname ${PVFS2_CLIENT_PIDFILE}) - if [ ! -d "${piddir}" ]; then - ewarn "Creating ${piddir}" - mkdir -p ${piddir} || return 1 - fi - - return 0 -} - -start() { - ebegin "Starting pvfs2-client" - local rc=0 - - $(lsmod | egrep "^pvfs2 " &> /dev/null) || modprobe pvfs2 - if [[ $? -ne 0 ]]; then - eend 1 "Failed to load the pvfs2 module" - return 1 - fi - - # -f so start-stop-daemon can snag the pid. - start-stop-daemon --start -q -b -m -p ${PVFS2_CLIENT_PIDFILE} \ - --exec ${PVFS2_CLIENT} -- -f -p ${PVFS2_CLIENT_CORE} ${PVFS2_CLIENT_ARGS} - rc=$? - - if [[ $rc -ne 0 ]]; then - eend ${rc} "Failed to run pvfs2-client" - return ${rc} - fi - - mount -t pvfs2 tcp://${PVFS2_SERVER_HOST}:3334/pvfs2-fs "${PVFS2_MOUNTPOINT}" - rc=$? - if [[ $rc -ne 0 ]]; then - eend 1 "Failed to mount the pvfs2 filesystem on ${PVFS2_MOUNTPOINT}" - return 1 - fi - - eend ${rc} -} - -stop() { - ebegin "Stopping pvfs2-client" - if [ -n "$(mount | awk '{print $3}' | grep ${PVFS2_MOUNTPOINT})" ]; then - umount -f ${PVFS2_MOUNTPOINT} - fi - - start-stop-daemon --stop -p ${PVFS2_CLIENT_PIDFILE} - - modprobe -r pvfs2 - - eend $? -} - diff --git a/sys-cluster/pvfs2/files/pvfs2-client-init.d-2.7.0 b/sys-cluster/pvfs2/files/pvfs2-client-init.d-2.7.0 deleted file mode 100644 index fb86356ec0a6..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-client-init.d-2.7.0 +++ /dev/null @@ -1,79 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-client-init.d-2.7.0,v 1.1 2008/03/06 23:05:44 jsbronder Exp $ - - -depend() { - need net - need localmount - before pbs_mom - after pvfs2-server -} - -checkconfig() { - if [ ! -x "${PVFS2_CLIENT}" -o ! -x "${PVFS2_CLIENT_CORE}" ]; then - eend 1 "pvfs-2 was not correctly installed." - return 1 - fi - - local piddir=$(dirname ${PVFS2_CLIENT_PIDFILE}) - if [ ! -d "${piddir}" ]; then - ewarn "Creating ${piddir}" - mkdir -p ${piddir} || return 1 - fi -} - -start() { - local rc=0 - local server_mp server mp - checkconfig || return 1 - ebegin "Starting pvfs2-client" - - if ! grep -qs pvfs2 /proc/filesystems; then - eerror "Kernel does not support pvfs2 filesystems" - return 1 - fi - - # Don't fork the client so we can get the pid with s-s-d. - if ! start-stop-daemon --start -m -b --quiet \ - --pidfile ${PVFS2_CLIENT_PIDFILE} \ - --exec "${PVFS2_CLIENT}" \ - -- -f -p ${PVFS2_CLIENT_CORE} ${PVFS2_CLIENT_ARGS}; then - rc=1 - elif [ -n "${PVFS2_MOUNTS}" ]; then - for server_mp in ${PVFS2_MOUNTS}; do - mount -t pvfs2 \ - tcp://$(echo ${server_mp} | cut -d',' -f1)/pvfs2-fs \ - $(echo ${server_mp} | cut -d',' -f2) - rc=$? - [[ ${rc} -ne 0 ]] && break - done - [[ ${rc} -ne 0 ]] && start-stop-daemon --stop -p ${PVFS2_CLIENT_PIDFILE} - fi - - eend ${rc} -} - -stop() { - local rc=0 - local server_mp - checkconfig || return 1 - ebegin "Stopping pvfs2-client" - - if [ -n "${PVFS2_MOUNTS}" ]; then - for server_mp in ${PVFS2_MOUNTS}; do - umount -f $(echo ${server_mp} | cut -d',' -f2) - rc=$? - [[ ${rc} -ne 0 ]] && break - done - fi - - if [[ ${rc} -eq 0 ]]; then - start-stop-daemon --stop -p ${PVFS2_CLIENT_PIDFILE} - rc=$? - fi - - eend ${rc} -} - diff --git a/sys-cluster/pvfs2/files/pvfs2-client.conf b/sys-cluster/pvfs2/files/pvfs2-client.conf deleted file mode 100644 index 72b8cc29a78b..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-client.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Extra arguments to supply to the pvfs2-client daemon -#PVFS2_CLIENT_ARGS="-L /var/log/pvfs2-client.log" - -# Location of the pvfs2-client binaries. Defaults are shown -PVFS2_CLIENT="/usr/sbin/pvfs2-client" -PVFS2_CLIENT_CORE="/usr/sbin/pvfs2-client-core" - -# Location to mount the pvfs2 filesystem -PVFS2_MOUNTPOINT="/pfs" - -# A pvfs2 metadata server. -PVFS2_SERVER_HOST="localhost" - -# Location to store pid -PVFS2_CLIENT_PIDFILE="/var/run/pvfs2-client.pid" diff --git a/sys-cluster/pvfs2/files/pvfs2-server-conf.d-2.7.0 b/sys-cluster/pvfs2/files/pvfs2-server-conf.d-2.7.0 deleted file mode 100644 index 7c8ed4ec05bf..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-server-conf.d-2.7.0 +++ /dev/null @@ -1,17 +0,0 @@ -# pvfs2 only uses one config file as of 2.7.0. This is the path -# to that config file. -PVFS2_FS_CONF="/etc/pvfs/pvfs2-fs.conf" - -# your server binary, default is shown. -PVFS2_SERVER=/usr/sbin/pvfs2-server - -# the server will record its PID in this file using the -p argument -PVFS2_PIDFILE=/var/run/pvfs2.pid - -#Additional options -PVFS2_OPTIONS="" - -# Automatically call pvfs2-server with --mkfs if the first call to start -# the daemon fails. Off by default as this does mess with the local -# filesystem to prepare the directory for pvfs2-server -PVFS2_AUTO_MKFS=0 diff --git a/sys-cluster/pvfs2/files/pvfs2-server-init.d-2.7.0 b/sys-cluster/pvfs2/files/pvfs2-server-init.d-2.7.0 deleted file mode 100644 index 8ac5fe93d283..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-server-init.d-2.7.0 +++ /dev/null @@ -1,65 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-server-init.d-2.7.0,v 1.1 2008/03/06 23:05:44 jsbronder Exp $ - -depend() { - after localmount netmount nfsmount dns - use net -} - - -checkconfig() { - local piddir=$(dirname "${PVFS2_PIDFILE}") - if [ ! -d "${piddir}" ]; then - mkdir -p "${piddir}" || return 1 - fi - - # verify presence of server binary - if ! [ -x "${PVFS2_SERVER}" ]; then - eerror "Could not find executable ${PVFS2_SERVER}" - return 1 - fi - - if ! [ -r "${PVFS2_FS_CONF}" ]; then - eerror "Could not read ${PVFS2_FS_CONF}" - return 1 - fi -} - -start() { - local rc - checkconfig || return 1 - - ebegin "Starting PVFS2 server" - - # Optionally force pvfs2-server to generate the pvfs2 filesystem. - if [[ ${PVFS2_AUTO_MKFS} -ne 0 && \ - ! -f $(grep StorageSpace ${PVFS2_FS_CONF} | cut -d' ' -f 2)/collections.db ]]; then - ewarn "Initializing the file system storage with --mkfs" - "${PVFS2_SERVER}" --mkfs "${PVFS2_FS_CONF}" - rc=$? - fi - - if [[ ${rc} -eq 0 ]]; then - start-stop-daemon -b --start --quiet \ - --pidfile "${PVFS2_PIDFILE}" \ - --exec "${PVFS2_SERVER}" \ - -- -p "${PVFS2_PIDFILE}" ${PVFS2_OPTIONS} "${PVFS2_FS_CONF}" - rc=$? - fi - eend ${rc} -} - -stop() { - checkconfig || return 1 - ebegin "Stopping PVFS2 server" - start-stop-daemon --stop --quiet --pidfile "${PVFS2_PIDFILE}" - eend -} - -restart() { - svc_stop - sleep 2 - svc_start -} diff --git a/sys-cluster/pvfs2/files/pvfs2-server.conf b/sys-cluster/pvfs2/files/pvfs2-server.conf deleted file mode 100644 index 1779a870bf97..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-server.conf +++ /dev/null @@ -1,29 +0,0 @@ -# The three following variables set where pvfs2 will find the fs and server -# configuration files. If you don't set anything, these default to -# ${PVFS2_CONF_PATH}/pvfs2-<server/fs>.conf -PVFS2_FS_CONF="" - -# You can set either of the following. If PVFS2_SERVER_CONF is set, we -# look for that exact config file. If PVFS2_SERVER_CONF_BASE is set, -# we look for ${PVFS2_SERVER_CONF_BASE}-$(hostname -s). The latter -# is useful when distributing an image across multiple machines. When -# both are defined, preference is given to the the latter. -PVFS2_SERVER_CONF="" -PVFS2_SERVER_CONF_BASE="" - - -# your server binary, default is shown. -PVFS2SERVER=/usr/sbin/pvfs2-server - -# location of your config files -PVFS2_CONF_PATH=/etc - -# the server will record its PID in this file using the -p argument -PVFS2_PIDFILE=/var/run/pvfs2.pid - -#Additional options -PVFS2_OPTIONS="" - -# Automatically call pvfs2-server with --mkfs when we detect that the -# server is not continuing to run? -PVFS2_AUTO_MKFS=0 diff --git a/sys-cluster/pvfs2/files/pvfs2-server.rc b/sys-cluster/pvfs2/files/pvfs2-server.rc deleted file mode 100644 index 4706159e166a..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-server.rc +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-server.rc,v 1.1 2007/10/05 14:03:13 mabi Exp $ - -checkconfig() { - local piddir=$(dirname "${PVFS2_PIDFILE}") - if [ ! -d "${piddir}" ]; then - mkdir -p "${piddir}" || return 1 - fi - - # verify presence of server binary - if ! [ -x "${PVFS2SERVER}" ]; then - eerror "Error: could not find executable ${PVFS2SERVER}" - return 1 - fi - - # look for fs conf - if [ -n "${PVFS2_FS_CONF}" ]; then - PVFS2_FS_CONF="${PVFS2_CONF_PATH}/${PVFS2_FS_CONF}" - else - PVFS2_FS_CONF="${PVFS2_CONF_PATH}"/pvfs2-fs.conf - fi - - if ! [ -r "${PVFS2_FS_CONF}" ]; then - eerror "Error: could not read ${PVFS2_FS_CONF}" - return 1 - fi - - # look for server conf - if [ -n "${PVFS2_SERVER_CONF_BASE}" ]; then - local myhost=`hostname -s` - if [ "${myhost}" == "localhost" ]; then - ewarn "Warning: detected hostname as localhost, may confuse PVFS2 startup" - fi - PVFS2_SERVER_CONF="${PVFS2_CONF_PATH}/${PVFS2_SERVER_CONF_BASE}-${myhost}" - elif [ -n "${PVFS2_SERVER_CONF}" ]; then - PVFS2_SERVER_CONF="${PVFS2_CONF_PATH}/${PVFS2_SERVER_CONF}" - else - PVFS2_SERVER_CONF="${PVFS2_CONF_PATH}/pvfs2-server.conf" - fi - - if ! [ -r "${PVFS2_SERVER_CONF}" ]; then - eerror "Error: could not read ${PVFS2_SERVER_CONF}" - return 1 - fi -} - -depend() { - after localmount netmount nfsmount dns - use net -} - -start() { - ebegin "Starting PVFS2 server" - local rc - checkconfig || return 1 - - start-stop-daemon -b --start --quiet \ - --pidfile "${PVFS2_PIDFILE}" \ - --exec "${PVFS2SERVER}" -- -p "${PVFS2_PIDFILE}" ${PVFS2_OPTIONS} \ - "${PVFS2_FS_CONF}" "${PVFS2_SERVER_CONF}" - rc=$? - - # Optionally force pvfs2-server to generate the pvfs2 filesystem. - if [[ $PVFS2_AUTO_MKFS -ne 0 ]]; then - local test_pid - sleep 1 - test_pid=$(pidof pvfs2-server) - if [ -z "$test_pid" ] || [ ! -f "${PVFS2_PIDFILE}" ] || [[ $test_pid -ne `cat ${PVFS2_PIDFILE}` ]]; then - rm -f "${PVFS2_PIDFILE}" &>/dev/null - ewarn "Initializing the file system storage with --mkfs" - "${PVFS2SERVER}" --mkfs "${PVFS2_FS_CONF}" "${PVFS2_SERVER_CONF}" - rc=$? - if [[ $rc -ne 0 ]]; then - eerror "Failed to initialize the filesystem storage with --mkfs" - eend ${rc} - return 1 - fi - start-stop-daemon -b --start --quiet \ - --pidfile ${PVFS2_PIDFILE} \ - --exec ${PVFS2SERVER} -- -p "${PVFS2_PIDFILE}" ${PVFS2_OPTIONS} \ - "${PVFS2_FS_CONF}" "${PVFS2_SERVER_CONF}" - rc=$? - fi - fi - - if [[ $rc -ne 0 ]]; then - eend $rc "Error starting PVFS2 server" - return 1 - else - eend 0 - return 0 - fi -} - -stop() { - ebegin "Stopping PVFS2 server" - start-stop-daemon --stop --quiet --pidfile "${PVFS2_PIDFILE}" - eend $? "Error stopping PVFS2 server" -} - -restart() { - svc_stop - sleep 2 - svc_start -} diff --git a/sys-cluster/pvfs2/files/pvfs2-split-kernapps.patch b/sys-cluster/pvfs2/files/pvfs2-split-kernapps.patch deleted file mode 100644 index eb1eb97ec24b..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-split-kernapps.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN pvfs-2.7.1/Makefile.in pvfs-2.7.1_patched/Makefile.in ---- pvfs-2.7.1/Makefile.in 2008-04-14 11:37:32.000000000 -0400 -+++ pvfs-2.7.1_patched/Makefile.in 2008-04-16 22:00:55.354355245 -0400 -@@ -984,10 +984,13 @@ - install -d $(KMOD_DIR) - install -m 755 src/kernel/linux-2.6/pvfs2.ko $(KMOD_DIR) - --.PHONY: kmod_install --kmod_install: kmod kernapps just_kmod_install -+.PHONY: kernapps_install -+kernapps_install: kernapps - install -d $(sbindir) - install -m 755 $(KERNAPPS) $(KERNAPPSTHR) $(sbindir) -+ -+.PHONY: kmod_install -+kmod_install: kmod kernapps_install just_kmod_install - endif - - ifneq (,$(LINUX24_KERNEL_SRC)) diff --git a/sys-cluster/pvfs2/files/pvfs2-super.c.patch b/sys-cluster/pvfs2/files/pvfs2-super.c.patch deleted file mode 100644 index 342813b769be..000000000000 --- a/sys-cluster/pvfs2/files/pvfs2-super.c.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: src/kernel/linux-2.6/super.c -=================================================================== -RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/super.c,v -retrieving revision 1.102 -diff -a -u -r1.102 super.c ---- src/kernel/linux-2.6/super.c 10 Jun 2008 14:35:23 -0000 1.102 -+++ src/kernel/linux-2.6/super.c 23 Jul 2008 18:14:20 -0000 -@@ -7,6 +7,7 @@ - #include "pvfs2-kernel.h" - #include "pvfs2-bufmap.h" - #include "pvfs2-internal.h" -+#include "linux/version.h" - - /* list for storing pvfs2 specific superblocks in use */ - LIST_HEAD(pvfs2_superblocks); -@@ -320,6 +321,7 @@ - - #endif /* PVFS2_LINUX_KERNEL_2_4 */ - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) - /* called when the VFS removes this inode from the inode cache */ - static void pvfs2_put_inode( - struct inode *inode) -@@ -349,6 +351,7 @@ - #endif - } - } -+#endif - - #ifdef HAVE_STATFS_LITE_SUPER_OPERATIONS - static int pvfs2_statfs_lite( -@@ -852,14 +855,18 @@ - clear_inode: pvfs2_clear_inode, - put_inode: pvfs2_put_inode, - #else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) - .drop_inode = generic_delete_inode, -+#endif - .alloc_inode = pvfs2_alloc_inode, - .destroy_inode = pvfs2_destroy_inode, - #ifdef HAVE_READ_INODE - .read_inode = pvfs2_read_inode, - #endif - .dirty_inode = pvfs2_dirty_inode, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) - .put_inode = pvfs2_put_inode, -+#endif - .statfs = pvfs2_statfs, - .remount_fs = pvfs2_remount, - #ifdef HAVE_FIND_INODE_HANDLE_SUPER_OPERATIONS
\ No newline at end of file diff --git a/sys-cluster/pvfs2/metadata.xml b/sys-cluster/pvfs2/metadata.xml deleted file mode 100644 index 29f9321ab91c..000000000000 --- a/sys-cluster/pvfs2/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>cluster</herd> - <maintainer> - <email>jsbronder@gentoo.org</email> - </maintainer> - <use> - <flag name='apidocs'>Build API documentation directly from the code using - doxygen</flag> - <flag name='server'>Enable compilation of server code</flag> - </use> -</pkgmetadata> diff --git a/sys-cluster/pvfs2/pvfs2-2.7.0-r2.ebuild b/sys-cluster/pvfs2/pvfs2-2.7.0-r2.ebuild deleted file mode 100644 index 7f26919d94f5..000000000000 --- a/sys-cluster/pvfs2/pvfs2-2.7.0-r2.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.7.0-r2.ebuild,v 1.4 2011/03/29 12:55:34 angelos Exp $ - -EAPI=1 -inherit linux-mod autotools toolchain-funcs - -MY_PN="${PN%[0-9]*}" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Parallel Virtual File System version 2" -HOMEPAGE="http://www.pvfs.org/" -SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz" -IUSE="gtk server static doc ssl examples apidocs" -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - ssl? ( dev-libs/openssl ) - sys-libs/db" -DEPEND="${RDEPEND} - doc? ( dev-tex/latex2html ) - apidocs? ( app-doc/doxygen ) - virtual/linux-sources" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86 ~ppc64" - -pkg_setup() { - linux-mod_pkg_setup - - if kernel_is 2 4; then - BUILD_TARGETS="just_kmod24" - ECONF_PARAMS="--with-kernel24=${KV_DIR}" - MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)" - else - BUILD_TARGETS="just_kmod" - ECONF_PARAMS="--with-kernel=${KV_DIR} --enable-verbose-build" - MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)" - fi - - ECONF_PARAMS="${ECONF_PARAMS} - --enable-mmap-racache - --sysconfdir=/etc/pvfs2 - --enable-shared - --enable-static - $(use_enable static static-server) - $(use_enable gtk karma) - $(use_enable server) - $(use_with ssl openssl /usr/$(get_libdir))" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Upstream packed all of these by mistake. - # TODO: Shouldn't be needed next release. - find "${S}" -name '*\.d' | xargs rm -rf - - # All of these must be done in order and are required to fix the bug noted - # at: http://www.beowulf-underground.org/pipermail/pvfs2-developers/2008-January/003790.html - # TODO: Shouldn't be needed next release. - epatch "${FILESDIR}"/${PV}-ctl_unnumbered.patch - epatch "${FILESDIR}"/${PV}-kernel-rt.patch - epatch "${FILESDIR}"/${PV}-verbose-checking.patch - epatch "${FILESDIR}"/${PV}-kmem_cache.patch - - # Fixes destdir, separates the kernel module from the userland build, - # forces enabling of the shared threaded library. Fixes so names and - # makes links. as-needed fixes for the shared libs. All to Makefile.in - epatch "${FILESDIR}"/2.7.0-gentoo-makefile.patch - - # Fix --enable-static-server to correctly use AC_ARG_ENABLE - epatch "${FILESDIR}"/2.7.0-configure-static-server.patch - - # as-needed patchs - sed -i \ - -e "s:LIBS=\"\$LIBS.*:LIBS=\"\$LIBS -lcrypt -lcrypto -lssl\":g" \ - maint/config/openssl.m4 || die - sed -i 's:LDFLAGS=.*-lrt.*:LIBS="\$LIBS -lrt":' maint/config/rt.m4 || die - - # The following makes some builds die by actually spitting out more errors. - # See bug #210923. If this breaks other things, it's my fault. - sed -i 's:-Wno-strict-aliasing=2::' maint/config/kernel.m4 || die - - AT_M4DIR="maint/config" eautoreconf || die -} - -src_compile() { - linux-mod_src_compile || die - emake kernapps || die - emake all || die - if use doc; then - emake docs || die - if use apidocs; then - cd "${S}"/doc - doxygen doxygen/pvfs2-doxygen.conf || die - fi - fi -} - -src_install() { - linux-mod_src_install || die - emake DESTDIR="${D}" kernapps_install || die - emake DESTDIR="${D}" install || die - - if use server; then - newinitd "${FILESDIR}"/pvfs2-server-init.d-2.7.0 pvfs2-server - newconfd "${FILESDIR}"/pvfs2-server-conf.d-2.7.0 pvfs2-server - fi - - newinitd "${FILESDIR}"/pvfs2-client-init.d-2.7.0 pvfs2-client - newconfd "${FILESDIR}"/pvfs2-client-conf.d-2.7.0 pvfs2-client - - dodoc AUTHORS CREDITS ChangeLog INSTALL README - - # this is LARGE (~5mb) - if use doc; then - dodoc doc/multi-fs-doc.txt doc/add-server-req \ - doc/add-client-syscall doc/coding/valgrind \ - doc/coding/backtrace_analysis.txt - insinto /usr/share/doc/${PF} - doins doc/*.pdf doc/coding/developer-guidelines.pdf \ - doc/design/*.pdf doc/random/SystemInterfaceTesting.pdf - if use apidocs; then - dohtml -A map -A md5 doc/doxygen/html/* - fi - fi - if use examples; then - docinto examples/heartbeat - dodoc examples/heartbeat/* - docinto examples - dodoc examples/fs.conf - fi -} - -pkg_preinst() { - linux-mod_pkg_preinst -} - -pkg_postinst() { - linux-mod_pkg_postinst - local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})" - elog "1.) Pvfs2 uses a unified configuration file as of 2.7.0. If you" - elog " have configuration files from an earlier version, use the provided:" - elog " ${ROOT}usr/bin/pvfs2-config-convert" - elog "to automatically update to the newer configuration scheme." - elog "2.) Use emerge --config pvfs2 to create new configuration files." - elog "3.) If the storage space has not been previously created, either set" - elog " PVFS2_AUTO_MKFS=1 in ${ROOT}etc/conf.d/pvfs2-server or run:" - elog " ${ROOT}usr/sbin/pvfs2-server --mkfs ${f}" -} - -pkg_config() { - local s - local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})" - if [[ -f "${f}" ]]; then - ewarn "Previous install detected." - ewarn "We're about to wipe out ${f} and replace it with" - ewarn "the file generated by running pvfs2-genconfig. If this is what" - ewarn "you want to do, hit any key to continue. Otherwise hit ctrl+C" - ewarn "to abort." - read s - fi - einfo "Creating new unified configuration file" - ewarn "WARNING: pvfs2 is picky about hostnames. Make sure you use the" - ewarn "correct shortname for all nodes and have name resolution for these" - ewarn "shortnames correctly configured on all nodes." - [ ! -d "${ROOT}$(dirname "${f}")" ] && mkdir -p "${ROOT}$(dirname "${f}")" - "${ROOT}"usr/bin/pvfs2-genconfig "${f}" -} diff --git a/sys-cluster/pvfs2/pvfs2-2.7.1-r1.ebuild b/sys-cluster/pvfs2/pvfs2-2.7.1-r1.ebuild deleted file mode 100644 index 2c720a659f0c..000000000000 --- a/sys-cluster/pvfs2/pvfs2-2.7.1-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.7.1-r1.ebuild,v 1.2 2011/03/29 12:55:34 angelos Exp $ - -EAPI=1 -inherit linux-mod toolchain-funcs autotools - -MY_PN="${PN%[0-9]*}" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Parallel Virtual File System version 2" -HOMEPAGE="http://www.pvfs.org/" -SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz" -IUSE="apidocs doc examples gtk server ssl static" -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - ssl? ( dev-libs/openssl ) - sys-libs/db" -DEPEND="${RDEPEND} - doc? ( dev-tex/latex2html ) - apidocs? ( app-doc/doxygen ) - virtual/linux-sources" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -pkg_setup() { - linux-mod_pkg_setup - - if kernel_is 2 4; then - BUILD_TARGETS="just_kmod24" - ECONF_PARAMS="--with-kernel24=${KV_OUT_DIR}" - MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)" - else - BUILD_TARGETS="just_kmod" - ECONF_PARAMS="--with-kernel=${KV_OUT_DIR} --enable-verbose-build" - MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)" - fi - - ECONF_PARAMS="${ECONF_PARAMS} - --enable-mmap-racache - --sysconfdir=/etc/pvfs2 - --enable-shared - --enable-static - $(use_enable static static-server) - $(use_enable gtk karma) - $(use_enable server) - $(use_with ssl openssl /usr/$(get_libdir))" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Upstream doesn't seem to want to apply this which makes - # sense as it probably only matters to us. Simple patch - # to split the installation of the module (which we use - # the eclass for) and the installation of the kernapps. - epatch "${FILESDIR}"/${PN}-split-kernapps.patch - - # Support for >=linux-2.6.25, should be unnecessary next release. - sed -i 's/ Q=@echo >.*/ Q=@/' src/kernel/linux-2.6/Makefile.in - # upstream patch for 2.6.26 kernels - epatch "${FILESDIR}"/${PN}-super.c.patch - - # upstream patch for 2.6.29+ MAIN:pcarns:20090401202748, MAIN:pcarns:20090401212735 - epatch "${FILESDIR}"/${P}-2.6.29-fixes.patch - - # upstream patch for 2.6.30+ MAIN:pcarns:20090630184815 - if kernel_is -ge 2 6 30; then - epatch "${FILESDIR}"/${P}-2.6.30-fixes.patch - fi - - AT_M4DIR=./maint/config eautoreconf || die -} - -src_compile() { - linux-mod_src_compile || die - emake kernapps || die - emake all || die - if use doc; then - emake docs || die - if use apidocs; then - cd "${S}"/doc - doxygen doxygen/pvfs2-doxygen.conf || die - fi - fi -} - -src_install() { - linux-mod_src_install || die - emake DESTDIR="${D}" kernapps_install || die - emake DESTDIR="${D}" install || die - - if use server; then - newinitd "${FILESDIR}"/pvfs2-server-init.d-2.7.0 pvfs2-server - newconfd "${FILESDIR}"/pvfs2-server-conf.d-2.7.0 pvfs2-server - fi - - newinitd "${FILESDIR}"/pvfs2-client-init.d-2.7.0 pvfs2-client - newconfd "${FILESDIR}"/pvfs2-client-conf.d-2.7.0 pvfs2-client - - dodoc AUTHORS CREDITS ChangeLog INSTALL README - - # this is LARGE (~5mb) - if use doc; then - dodoc doc/multi-fs-doc.txt doc/add-server-req \ - doc/add-client-syscall doc/coding/valgrind \ - doc/coding/backtrace_analysis.txt - insinto /usr/share/doc/${PF} - doins doc/*.pdf doc/coding/developer-guidelines.pdf \ - doc/design/*.pdf doc/random/SystemInterfaceTesting.pdf - if use apidocs; then - dohtml -A map -A md5 doc/doxygen/html/* - fi - fi - if use examples; then - docinto examples/heartbeat - dodoc examples/heartbeat/* - docinto examples - dodoc examples/fs.conf - fi -} - -pkg_preinst() { - linux-mod_pkg_preinst -} - -pkg_postinst() { - linux-mod_pkg_postinst - local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})" - elog "1.) Pvfs2 uses a unified configuration file as of 2.7.0. If you" - elog " have configuration files from an earlier version, use the provided:" - elog " ${ROOT}usr/bin/pvfs2-config-convert" - elog "to automatically update to the newer configuration scheme." - elog "2.) Use emerge --config pvfs2 to create new configuration files." - elog "3.) If the storage space has not been previously created, either set" - elog " PVFS2_AUTO_MKFS=1 in ${ROOT}etc/conf.d/pvfs2-server or run:" - elog " ${ROOT}usr/sbin/pvfs2-server --mkfs ${f}" -} - -pkg_config() { - local s - local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})" - if [[ -f "${f}" ]]; then - ewarn "Previous install detected." - ewarn "We're about to wipe out ${f} and replace it with" - ewarn "the file generated by running pvfs2-genconfig. If this is what" - ewarn "you want to do, hit any key to continue. Otherwise hit ctrl+C" - ewarn "to abort." - read s - fi - einfo "Creating new unified configuration file" - ewarn "WARNING: pvfs2 is picky about hostnames. Make sure you use the" - ewarn "correct shortname for all nodes and have name resolution for these" - ewarn "shortnames correctly configured on all nodes." - [ ! -d "${ROOT}$(dirname "${f}")" ] && mkdir -p "${ROOT}$(dirname "${f}")" - "${ROOT}"usr/bin/pvfs2-genconfig "${f}" -} diff --git a/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild b/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild deleted file mode 100644 index 6f73f8790db2..000000000000 --- a/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild,v 1.9 2011/03/29 12:55:34 angelos Exp $ - -EAPI=1 -inherit linux-mod toolchain-funcs - -MY_PN="${PN%[0-9]*}" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Parallel Virtual File System version 2" -HOMEPAGE="http://www.pvfs.org/" -SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz" -IUSE="apidocs doc examples gtk server ssl static" -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - ssl? ( dev-libs/openssl ) - sys-libs/db" -DEPEND="${RDEPEND} - doc? ( dev-tex/latex2html ) - apidocs? ( app-doc/doxygen ) - virtual/linux-sources" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~ppc64 x86" - -pkg_setup() { - linux-mod_pkg_setup - - if kernel_is 2 4; then - BUILD_TARGETS="just_kmod24" - ECONF_PARAMS="--with-kernel24=${KV_OUT_DIR}" - MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.4)" - else - BUILD_TARGETS="just_kmod" - ECONF_PARAMS="--with-kernel=${KV_OUT_DIR} --enable-verbose-build" - MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)" - fi - - ECONF_PARAMS="${ECONF_PARAMS} - --enable-mmap-racache - --sysconfdir=/etc/pvfs2 - --enable-shared - --enable-static - $(use_enable static static-server) - $(use_enable gtk karma) - $(use_enable server) - $(use_with ssl openssl /usr/$(get_libdir))" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Upstream doesn't seem to want to apply this which makes - # sense as it probably only matters to us. Simple patch - # to split the installation of the module (which we use - # the eclass for) and the installation of the kernapps. - epatch "${FILESDIR}"/${PN}-split-kernapps.patch - - # Support for >=linux-2.6.25, should be unnecessary next release. - sed -i 's/ Q=@echo >.*/ Q=@/' src/kernel/linux-2.6/Makefile.in - # upstream patch for 2.6.26 kernels - epatch "${FILESDIR}"/${PN}-super.c.patch -} - -src_compile() { - linux-mod_src_compile || die - emake kernapps || die - emake all || die - if use doc; then - emake docs || die - if use apidocs; then - cd "${S}"/doc - doxygen doxygen/pvfs2-doxygen.conf || die - fi - fi -} - -src_install() { - linux-mod_src_install || die - emake DESTDIR="${D}" kernapps_install || die - emake DESTDIR="${D}" install || die - - if use server; then - newinitd "${FILESDIR}"/pvfs2-server-init.d-2.7.0 pvfs2-server - newconfd "${FILESDIR}"/pvfs2-server-conf.d-2.7.0 pvfs2-server - fi - - newinitd "${FILESDIR}"/pvfs2-client-init.d-2.7.0 pvfs2-client - newconfd "${FILESDIR}"/pvfs2-client-conf.d-2.7.0 pvfs2-client - - dodoc AUTHORS CREDITS ChangeLog INSTALL README - - # this is LARGE (~5mb) - if use doc; then - dodoc doc/multi-fs-doc.txt doc/add-server-req \ - doc/add-client-syscall doc/coding/valgrind \ - doc/coding/backtrace_analysis.txt - insinto /usr/share/doc/${PF} - doins doc/*.pdf doc/coding/developer-guidelines.pdf \ - doc/design/*.pdf doc/random/SystemInterfaceTesting.pdf - if use apidocs; then - dohtml -A map -A md5 doc/doxygen/html/* - fi - fi - if use examples; then - docinto examples/heartbeat - dodoc examples/heartbeat/* - docinto examples - dodoc examples/fs.conf - fi -} - -pkg_preinst() { - linux-mod_pkg_preinst -} - -pkg_postinst() { - linux-mod_pkg_postinst - local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})" - elog "1.) Pvfs2 uses a unified configuration file as of 2.7.0. If you" - elog " have configuration files from an earlier version, use the provided:" - elog " ${ROOT}usr/bin/pvfs2-config-convert" - elog "to automatically update to the newer configuration scheme." - elog "2.) Use emerge --config pvfs2 to create new configuration files." - elog "3.) If the storage space has not been previously created, either set" - elog " PVFS2_AUTO_MKFS=1 in ${ROOT}etc/conf.d/pvfs2-server or run:" - elog " ${ROOT}usr/sbin/pvfs2-server --mkfs ${f}" -} - -pkg_config() { - local s - local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})" - if [[ -f "${f}" ]]; then - ewarn "Previous install detected." - ewarn "We're about to wipe out ${f} and replace it with" - ewarn "the file generated by running pvfs2-genconfig. If this is what" - ewarn "you want to do, hit any key to continue. Otherwise hit ctrl+C" - ewarn "to abort." - read s - fi - einfo "Creating new unified configuration file" - ewarn "WARNING: pvfs2 is picky about hostnames. Make sure you use the" - ewarn "correct shortname for all nodes and have name resolution for these" - ewarn "shortnames correctly configured on all nodes." - [ ! -d "${ROOT}$(dirname "${f}")" ] && mkdir -p "${ROOT}$(dirname "${f}")" - "${ROOT}"usr/bin/pvfs2-genconfig "${f}" -} |