diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2013-07-26 11:43:05 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2013-07-26 11:43:05 +0000 |
commit | d45bb328fc4cd28b734c2b0796ba9b6109d6b014 (patch) | |
tree | f8177ccf446affcdb6e5bdcf403d7e865e07eb57 /sys-cluster | |
parent | sci-libs/ccp4-libs: Fix another broken variable (diff) | |
download | historical-d45bb328fc4cd28b734c2b0796ba9b6109d6b014.tar.gz historical-d45bb328fc4cd28b734c2b0796ba9b6109d6b014.tar.bz2 historical-d45bb328fc4cd28b734c2b0796ba9b6109d6b014.zip |
Version bump (bug #477904), use python-single-r1.eclass and EAPI-5, add USE flags for systemtap, debug, bd-xlator, georeplication, fix the license and install more extras (if requested). Rewrote glusterd init.d-script, including comments from bug #413417. Fix deps (bug #455328) and parallel build issues.
Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x1E0CA85F!
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/glusterfs/ChangeLog | 14 | ||||
-rw-r--r-- | sys-cluster/glusterfs/Manifest | 32 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterd-r1.initd | 16 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs-3.4.0-build-shared-only.patch | 505 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs-3.4.0-parallel-build.patch | 27 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch | 23 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-3.4.0.ebuild | 145 | ||||
-rw-r--r-- | sys-cluster/glusterfs/metadata.xml | 3 |
8 files changed, 749 insertions, 16 deletions
diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog index d8eb62c666d9..2391ccdf9e70 100644 --- a/sys-cluster/glusterfs/ChangeLog +++ b/sys-cluster/glusterfs/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for sys-cluster/glusterfs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.46 2013/04/03 15:03:44 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.47 2013/07/26 11:43:00 dev-zero Exp $ + +*glusterfs-3.4.0 (26 Jul 2013) + + 26 Jul 2013; Tiziano Müller <dev-zero@gentoo.org> +files/glusterd-r1.initd, + +files/glusterfs-3.4.0-build-shared-only.patch, + +files/glusterfs-3.4.0-parallel-build.patch, + +files/glusterfs-3.4.0-silent_rules.patch, +glusterfs-3.4.0.ebuild, + metadata.xml: + Version bump (bug #477904), use python-single-r1.eclass and EAPI-5, add USE + flags for systemtap, debug, bd-xlator, georeplication, fix the license and + install more extras (if requested). Rewrote glusterd init.d-script, including + comments from bug #413417. Fix deps (bug #455328) and parallel build issues. *glusterfs-3.3.1-r2 (03 Apr 2013) diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index 74bac8d941cd..f3601d208a65 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -3,6 +3,7 @@ Hash: SHA256 AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173 AUX glusterd-3.2.0-workdir.patch 1651 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80 SHA512 052496bda60b70ae8b3bd7d44cbeae093b9de80f56d8373dce4ff18fc50250a17cfeb38a00a111c5d17fed64962f48bc6d12100c0cfe0fbb83ec594a3d98b7bb WHIRLPOOL 7dafc97a1c4b17a9c4e3626f0b67e963f01adca295074e4cf80e85cf0ec096bd78a65eebb140925e092c2c5af29e4cac7e31faa5b16cfa4945f0321d95eeb6d9 +AUX glusterd-r1.initd 451 SHA256 de39e1118fa1bfcc517f711e819ec78e67c58270383372a17886ca7362a7064b SHA512 90ba1109d393df99d7cc3092862684fd9d9a84b8ff8d7c7b5c7bfdabacee6ee209aa13e7c8d6b9497967aa5b5c30e984adf231b394dfbebb5d4d1f15b9f70f28 WHIRLPOOL 630596cba4af48fcdfb94bedf7f6a609dce85ac8dda835b699fd2ad0c3af64bd0b014c6fb97fe9d6faff8fc9a9652a2636e85372384027ac013abedeb71287c1 AUX glusterd-workdir.patch 1528 SHA256 b614c90279fd0546d353f017616dff798e73a20c45fa846d57a35bf4569389df SHA512 767ff40ba6ac41568925eb1eae3d6af384b0e5ac3a1c45bc3e4a1819ab195af66053aae5cd4719d2ec75a768094853a1dd1fb42dee3013b680bef2c8088fde58 WHIRLPOOL 15bbe5044bf2c963b3c68a6d68ea7f85a68a893aa426ebe46eff04668367e9df4b326cec632728a3fdf2a5ae8a83ed5ad92d9991947d4efd38a7b7652445a64f AUX glusterd.initd 833 SHA256 cd6d277236a9bc22cb3872269d1454c2c5a140cea6a9badb3b6ba2d88ae52232 SHA512 d1eb3fe843a66850143e6cf66f1e66f33f6124d18e7a342f85a4bb6b3ff0c9a88d449aec00b3f1ec8305487b47686ff7cc323ecfc98f6a4340dd0d63c3b81dee WHIRLPOOL 1b89343f2993b719ccdacdab7233606c6dfee0823a7221658c4712248e421d87a3079334f546ff53cc736008a5c8dbe7c02680c5aee0adc711c26d444caa03e1 AUX glusterfs-3.1.0-parallel-build.patch 659 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c SHA512 9bfa0572beda5d132a47d9a52c2f6c3149abec36054a5d20203acf01e624721a7e9f9dd603b43a724f0eb5e01ecf45696de8b5a3b6204ff9871cefaae85c5bf8 WHIRLPOOL 8d7037a6ec21d4e099d696628428747182a1c416bc6a158dd7c55633a009cbaa81aed919a3108ba35f30d1593b4027bfcd2662ee457b43c28122ade91a1688cc @@ -10,6 +11,9 @@ AUX glusterfs-3.3.0-avoid-version.patch 18734 SHA256 76d41c57dde89bd2e0f13aad5d7 AUX glusterfs-3.3.0-docdir.patch 756 SHA256 f1af7734b9b886a6de89dbc86deea4917ad8e2e37018a560325ca51702b3e8b1 SHA512 440ccff6aecb539aeab8b198d89aea2523bccca06e8884a85f7fc41db89c72cd93d9f26b94deb1d6176e13793b94ad1086ac7293787b94f1613b8bcbb162d3f0 WHIRLPOOL 27991f9ece9ac3723e8d33fa8a3fe2c22a4de2e23a368a7a28b2c43b75c1800ec1bc29e447e65830dd27f5018ae40da63122e601f50e8d6a3dadab93c7c373f9 AUX glusterfs-3.3.0-parallel-build.patch 618 SHA256 822f6c339541f7a10e01efcbb04214d4628a08e766e742d5891fb28975624e5e SHA512 697e5aca20f47813e7c6fa237e150eec0937135207e710edf1fda3ab3b90b8c116a32f970f22816074928ddcd1040977576e015cce9b42767c54abd8b75fade1 WHIRLPOOL 343ed65732137bca28ff1ed22825dcc617f298fbb2506cae79de3695534ea9ffce6e9880316f5d09ef33d13e42c6a298849ca49ddccf7060cca298e71a5311d1 AUX glusterfs-3.3.0-silent_rules.patch 611 SHA256 6795dce0036131827fb10da67912bc5d6a675697d7d2bbc135790917b9917cf2 SHA512 057c4ffbf8c229a57ae652b93e4c92e7e2a222c4d9dbdd1b44b5da1a47eb3462960698cb3a27ed5f83dcf75e7e9ed515ece3e82a10a41da02bcb5af63d6df63c WHIRLPOOL a2cf7ea041aa0a0ee8d398c7d75ae68e144389301dc1c4a243c0e2c1db332223f48b775f432d5468b1464770fe12ef0362d3178f771d2b4346dc864865a99a29 +AUX glusterfs-3.4.0-build-shared-only.patch 22147 SHA256 d11a171ffbc7b8a1fbcac5c651b2ad889a80b80bb2104787d6fd4bf56a2c2379 SHA512 a7b9a21717dff9f884674ea8b2b35e55f15c80a3ef4489a3ee2599c3f6d00534acedd6cbe09005d01d80a1fd0fc2e123745daa5bc7ca4d2166faed4a2b9822fa WHIRLPOOL 2a080cdbacac269b88109df6f3cb45a33bcddd0dfaf65a09160e8e17a9ef78e760f80b6acb3f9166ae7d4494820ec6562b3be8527510f93638556e21e7ce27c1 +AUX glusterfs-3.4.0-parallel-build.patch 951 SHA256 d31f674c16f18ac609093eb68e3e58487fc287d0e613e67013a3817739482ade SHA512 f8ff51eaad6d858764c6c30e0e426d3a6d43b77b4eb674936aee9c43dc29a7dd4b6d80237d0bed3b4fab1478a6a5481ed8236f0ff61b910cbec7fc2073295a13 WHIRLPOOL e1238f4f2215e04e2fbc0ab12169b4c75791bae4d600337adb0d8984fab3f1e68e408630fe5339d524ce976790976b22f3b52898ae4cf832208f90e856a1ad0e +AUX glusterfs-3.4.0-silent_rules.patch 553 SHA256 08a55b2f54050ad47dae1a953fc1f1410842556bf2464ab15e7df9019ab24de5 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce WHIRLPOOL e596ee4c6fae6cb7f843501b55e832791d612547f81d5e6adf4e96ea8cc4fc20fd71d5164f7fe42a74ed0b8e7036643cd5b684317f98bfd610b91dbe4c4c3684 AUX glusterfs-docdir.patch 1644 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07 SHA512 df942eb947c5568f78757a4629389cb5fc5b436ebf4f9ae15c95fb09549b20f939b4bbf5fc478ced803230f31f15373fad73cfc810f79f737cd0f4d7de3321e3 WHIRLPOOL 5ec4e6b02d0bd83632339f3889a2673bff027a116953ecf282b24ea26cb295a9ddbb489ee76788549ebeae262ae3bc7e36b8047b4ddeda0edeca37bb6126e317 AUX glusterfs-r1.initd 3187 SHA256 2feecfabc353f6210b5f39c3a93e8eb9fa0a62dca6aa32dd9bf6796220b8fb49 SHA512 3129c5201de92d596a8ecd182b411d77093318c7a2a0b064a0111c0498cfb61d821a2922f9075cb991c965027a0494ef2bf49285e07bd816c2f28b8a5775bfc6 WHIRLPOOL 782ac2629a870ba835378e27e0af5195b9bb19da76ef3fc2a99d4140022c7697f36a03c13b0fc8c389367bd92cad377a80307ae982d7d8d1f2ecc6a0533009a2 AUX glusterfs.confd 129 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 WHIRLPOOL 114f076456845087bf4dc28fb179cfea335f5f03b1d16098d836b5b0487c46fba4ee48d0bfab8cff7b2326b9585b327271d5c1d402db8289cafdf29f70ac063d @@ -19,26 +23,24 @@ DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284 DIST glusterfs-3.3.0.tar.gz 2599586 SHA256 76d80ded9ecc5146131e9d59b03cbe09a18338ff0b32922b12fd453da6104f17 SHA512 d450c91e6326a89c39e5c7a17b0e7493318a642fbccf8c729a841adcc422388a300b8fd852f9f978098dc87d956a697b681be5287502b5dc0ab29c71e6b8b9c7 WHIRLPOOL 4836a6aa17de011d2fa94121934972e6d15e434f392f713edc2b9b1e7ef8648a31f209c9dc85fc7a5e0ae0f1e902797ae49726304390b7d14596103958ea58d9 DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf +DIST glusterfs-3.4.0.tar.gz 3774842 SHA256 2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8 SHA512 5eb08225c0dde5d2e7ea3de1531fdc155249647a0ffe8a472825cc5ca54762462811903e164dfb12f825dd569f7c1786275f843acf04f0668c0e6e7615a47381 WHIRLPOOL 05b194c94ede704631a7c8071b8857c38b01700c3b3cbfeb06708c026b8b18913cd233bee8508c04116ed0f9a15c919aec604927e9cd77566c6c633118347a25 EBUILD glusterfs-3.1.2.ebuild 3647 SHA256 e2835d83bf6e03f4b0bb9d4f7dd2749d0454204e401444a357fb4371d90c9be3 SHA512 ba02e24cc76ab53059ec76ce9f84aafdd2e1ea47ba9e34390f4f73bfc170a4037e65795af3d17315c19d5cb50f1e784d095cf2129d8debc102fb2305c1637def WHIRLPOOL f0f4285e4c3dbf0704c2e3770891f5997dd4468ff8b9e944f3a14e0e607744382451edd9afc05b6d485efef69d54a48b8ae20b3efb7103b6dee8ecf33a3d2122 EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c8560f0a937b9bdadb790fe7ff3 SHA512 2a9530fb240f220d9e3581053edf4fe18f1545223386c03e2b4f1a36fe2832cd8abc33110d234160bfc4a07f2532e1f2a7f4c976253b5fb45ef3a71b99833dde WHIRLPOOL 5a3d7d1b6349a266d2bdeb9be3061610c99bf8338cc724dba70d9db55e37b2a1fb10e798ae13130f010cc88445f58aa3006b459bf502184898de3c36cd21c3c5 EBUILD glusterfs-3.3.0.ebuild 3796 SHA256 bc7ebd431067f8e8b8c7c15ab16a2701e6d5e1b45935ec48216c516c2c8ae7c6 SHA512 af2a53e1e3786e7366a88a1d9191e3fc66204163e25b497668bbbee7b96e64d28212362bcb9ab6807ee229f6469eeee70e10919f9453161ae4423fc62445bf30 WHIRLPOOL 851ffce2dce2dd372a0a5e1af9f147ec517e5ba2118fe2ea33ba6c013b3ae4ddb0e4fa3332c3a8e4f3dc629bb88a5faa540e479425366cb1780485558572fcd6 EBUILD glusterfs-3.3.1-r2.ebuild 4071 SHA256 688fac9b91eacff4ebde95f0e60ee48bd3e0c0063f3603186e6f902e85b81d3d SHA512 e510359e5ea465cc1c8b3545b88b204671ed0d4b0bf2739ed8a5a324c12a1b04855c5fee5c8f1153b2916eb180fc9d225282af4982b3ff831d997ce90e8f8896 WHIRLPOOL dc55997fc5b0d8d9f59bb54406bab2c5699f9ce4f244b0465899906235a95942cc2f502e174a694c5a42206939195712dcddd2c8750417f5a7a4d04881e19924 -MISC ChangeLog 8627 SHA256 dbbf323d1e7d186b991b59b65a0e5e3fa24cf9cb379d19297e481766aff8f783 SHA512 9fb62aae66578ad6c0fe33d4959803919305114963fc22a3ff8130d9f44fa312c623e42f6290d608c242a64e9c7c3927e2a887c1d93b6a9acb2ba17c74db858a WHIRLPOOL d26417e6c10ff5519199221960285452d9d0ab79de06f37bd2c76e05fb88ad4898536452bd0169832cb4bbc7318bd1bf74e5b60f439abf15164605570e2af2d6 -MISC metadata.xml 747 SHA256 d1eba4f73ff87c510ceaef3f3847e81435d48996efa19a855278c870ca600ba0 SHA512 f5131c30b30d7e057dbfa36359ea666d12720d9beaa51e267d84e504fda0d75c493d21ffc9aeac9cfcc72f79827bd1c12c6d6315ca5bf0ebddea67f7fdcb8215 WHIRLPOOL eddbe28a06de26635e6dd9858a51a49d810fe4719182a52d387f69dd0dae613ecb021076836750ee1b76db6627aed4012f4813f831f5eea1a3c221c66e1a1dba +EBUILD glusterfs-3.4.0.ebuild 4596 SHA256 be89776c1efe47258810cae84a1618a4e1d92c2742031aa95360fc23fdbc4c78 SHA512 43a99433614bf414113fc42f99802e84654a20ed379207db8a9f53852218f95e5da594fb831894b5bcd8e373b4031bae7a8a2a80b61af314ac4feb85e38e536f WHIRLPOOL 134f6ab31f8972b91a60f4d133db33e46db9071526d5cf8073383ed4a1e70a2fb584a8b2e636b95ef8f7d00236af4373a88288ac8564613fe594cf33b8fec63a +MISC ChangeLog 9234 SHA256 08aae6d6fc9e8a41df04e693bbdf3eccbddcaf9e5fbf149626902a8714d14101 SHA512 f9a4647725c59a3d7c4c797716e2451de6eb9ed276490feb6e2f4ff7deeecd0cc485f2010507707e64b3e7e68215b2772e0a0b83a97932e89d72b8a4a05729ee WHIRLPOOL d63f2961cef405266332b299b8bbcd86767eeccb02e29b2c7e7606701b0b8d152474dbb1321cff2eb1211ba098c117cb0219e7e67cdc61d6b97afe58dd3399a5 +MISC metadata.xml 1037 SHA256 82d258e1fbfe283fdf38d31124dff45c25f0fd457952d3a06c46bbe14b3e21f3 SHA512 b25f18244e5d026360570769c64f547b2ccb94b7ee780190c800b83350a5ae8577e7a00413935abb84d3765b42b90edb9b4dee35bb8772ec97f1a9f8dca5c297 WHIRLPOOL 79c89cd1e212f341778d51db8144bab8fe144ef3ad6701312f3399cf55fd9c543bc4623b5c7827e6010f89e33b2661f42f127b7ec8e7ed39727c5987510cc631 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJRXETWAAoJEF0huFKJUZL5eOYP/2cOEP5yVRbgeLfijnr1n4Zw -Voe126vUaNxggcG1L+UI33VlYcp2ZbMEXhTvTEwe9XJ1MWAihNEdmLz6alm4z8FI -kLu6+fqIMbD/hwU9QMzqBTWGA+Nf8ZQdoh971Y4dIzU/veypTfMOI2ucMw0eUSrP -ufPU59WBlCaCDTPzEX3JeksW8zYGDPurLQBlXxTO+SWtodqDdc29Jek1cC0nLJE7 -jtt3mGu5X3MSX7kf4L7RAFl2h8OFhYTspxEg3a7zuS0oPMipRf5tzsVCOzd42wDx -tm++UzVIwzHDUvi/aBwilcrBx5kc8SfVuZnOz3wQfoZvnalXoD6hz8bD5URwEE16 -B/Zv8GTZGZCNNa6CosLHWUCmkP9UXQGkqdI1U36B4TMpyugxWBJfVPpphO2rz1py -tX4/AXS10jbfsSuqjgxdnwL+9WXWrOG1YzhMob7XBc1YK08VU0OqxJz/5BIixvh5 -wwP+80OAF98QjxvACjlfZ0/aCqH74V0TD7UfLbYs//pBhbpAaen0BQsFBp/jFJY2 -aj0HJi2GFaWjns50UF8DRxdbjo4HZ7o5R43VVR/FjG4qgFfqgWOednlKsw10XYNo -UeJqqDmwJ4yIkG25TQFtf/acTDP5T+JTLaZqVjRc9x71+gb6yoKmymmlHJoudF6F -mmm0+qr/O/pPoT8JnwPF -=bazK +iQF8BAEBCABmBQJR8mDJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RjI0QTQ0MjI1OURBNzI4MEIyREExRkQx +RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfu4cH/277v1V5XSbtJNv0rDpcblRs +nufTWcITWyfuG+/GjbQI0UdZ4GWmkknIBGQqKKxkGXZe0QZ2ANEZOUGo1K7/9Ry3 +7l6d5sBgrfP3HgLeieDwtXthFn+cgT2YeCc0hkQhcD2RD7EgQf67QQ4P6E/4elGq +2Nlz6L6LaWFsyJXnCFoJC28kZkAueTPddJVlVDFEekuDuxD1Oe69zpyFqgLYzgu3 +idnfsOJawYNrOfChpWkM+g87lS7Xjlke/OfwQlg06ooY4g4Knu3Tl+o+Shqd81B3 +MOn7Xfw++QZXSh/5NhnU/fifyO9FHx/Ad7hyNZNZVkIJOh+WHyoBrLGVTa0VrcU= +=OjVa -----END PGP SIGNATURE----- diff --git a/sys-cluster/glusterfs/files/glusterd-r1.initd b/sys-cluster/glusterfs/files/glusterd-r1.initd new file mode 100644 index 000000000000..788346c25c9b --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterd-r1.initd @@ -0,0 +1,16 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/files/glusterd-r1.initd,v 1.1 2013/07/26 11:43:00 dev-zero Exp $ + +description="Gluster elastic volume management daemon" +command="/usr/sbin/glusterd" +pidfile="/var/run/${SVCNAME}.pid" +command_args="-N" + +command_background="yes" + +depend() { + need net + before netmount +} diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-build-shared-only.patch new file mode 100644 index 000000000000..38afa6c4f387 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-3.4.0-build-shared-only.patch @@ -0,0 +1,505 @@ +From 96dfc056d9525dd102bd78dc2f25fa51e00fbab5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch> +Date: Fri, 26 Jul 2013 10:28:25 +0200 +Subject: [PATCH 2/2] Build shared plugins only. + +--- + rpc/rpc-transport/rdma/src/Makefile.am | 2 +- + rpc/rpc-transport/socket/src/Makefile.am | 2 +- + xlators/cluster/afr/src/Makefile.am | 4 ++-- + xlators/cluster/dht/src/Makefile.am | 6 +++--- + xlators/cluster/stripe/src/Makefile.am | 2 +- + xlators/debug/error-gen/src/Makefile.am | 2 +- + xlators/debug/io-stats/src/Makefile.am | 2 +- + xlators/debug/trace/src/Makefile.am | 2 +- + xlators/encryption/rot-13/src/Makefile.am | 2 +- + xlators/features/index/src/Makefile.am | 2 +- + xlators/features/locks/src/Makefile.am | 2 +- + xlators/features/mac-compat/src/Makefile.am | 2 +- + xlators/features/marker/src/Makefile.am | 2 +- + xlators/features/quiesce/src/Makefile.am | 2 +- + xlators/features/quota/src/Makefile.am | 2 +- + xlators/features/read-only/src/Makefile.am | 4 ++-- + xlators/mgmt/glusterd/src/Makefile.am | 2 +- + xlators/mount/fuse/src/Makefile.am | 2 +- + xlators/nfs/server/src/Makefile.am | 2 +- + xlators/performance/io-cache/src/Makefile.am | 2 +- + xlators/performance/io-threads/src/Makefile.am | 2 +- + xlators/performance/md-cache/src/Makefile.am | 2 +- + xlators/performance/open-behind/src/Makefile.am | 2 +- + xlators/performance/quick-read/src/Makefile.am | 2 +- + xlators/performance/read-ahead/src/Makefile.am | 2 +- + xlators/performance/symlink-cache/src/Makefile.am | 2 +- + xlators/performance/write-behind/src/Makefile.am | 2 +- + xlators/protocol/auth/addr/src/Makefile.am | 2 +- + xlators/protocol/auth/login/src/Makefile.am | 2 +- + xlators/protocol/client/src/Makefile.am | 2 +- + xlators/protocol/server/src/Makefile.am | 2 +- + xlators/storage/bd_map/src/Makefile.am | 2 +- + xlators/storage/posix/src/Makefile.am | 2 +- + xlators/system/posix-acl/src/Makefile.am | 2 +- + 34 files changed, 38 insertions(+), 38 deletions(-) + +diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am +index 2bf7cf2..8e52d70 100644 +--- a/rpc/rpc-transport/rdma/src/Makefile.am ++++ b/rpc/rpc-transport/rdma/src/Makefile.am +@@ -3,7 +3,7 @@ + transport_LTLIBRARIES = rdma.la + transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport + +-rdma_la_LDFLAGS = -module -avoid-version ++rdma_la_LDFLAGS = -module -avoid-version -shared + + rdma_la_SOURCES = rdma.c name.c + rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ +diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am +index 71e6ed6..b481fe9 100644 +--- a/rpc/rpc-transport/socket/src/Makefile.am ++++ b/rpc/rpc-transport/socket/src/Makefile.am +@@ -3,7 +3,7 @@ noinst_HEADERS = socket.h name.h + rpctransport_LTLIBRARIES = socket.la + rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport + +-socket_la_LDFLAGS = -module -avoid-version ++socket_la_LDFLAGS = -module -avoid-version -shared + + socket_la_SOURCES = socket.c name.c + socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl +diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am +index 35d18a6..959fea8 100644 +--- a/xlators/cluster/afr/src/Makefile.am ++++ b/xlators/cluster/afr/src/Makefile.am +@@ -7,11 +7,11 @@ afr_common_source = afr-dir-read.c afr-dir-write.c afr-inode-read.c \ + afr-self-heal-algorithm.c afr-lk-common.c afr-self-heald.c \ + $(top_builddir)/xlators/lib/src/libxlator.c + +-afr_la_LDFLAGS = -module -avoid-version ++afr_la_LDFLAGS = -module -avoid-version -shared + afr_la_SOURCES = $(afr_common_source) afr.c + afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +-pump_la_LDFLAGS = -module -avoid-version ++pump_la_LDFLAGS = -module -avoid-version -shared + pump_la_SOURCES = $(afr_common_source) pump.c + pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am +index 5324d21..d5f36ea 100644 +--- a/xlators/cluster/dht/src/Makefile.am ++++ b/xlators/cluster/dht/src/Makefile.am +@@ -12,13 +12,13 @@ dht_la_SOURCES = $(dht_common_source) dht.c + nufa_la_SOURCES = $(dht_common_source) nufa.c + switch_la_SOURCES = $(dht_common_source) switch.c + +-dht_la_LDFLAGS = -module -avoid-version ++dht_la_LDFLAGS = -module -avoid-version -shared + dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +-nufa_la_LDFLAGS = -module -avoid-version ++nufa_la_LDFLAGS = -module -avoid-version -shared + nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +-switch_la_LDFLAGS = -module -avoid-version ++switch_la_LDFLAGS = -module -avoid-version -shared + switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + + noinst_HEADERS = dht-common.h dht-mem-types.h \ +diff --git a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am +index 2d15142..6989de9 100644 +--- a/xlators/cluster/stripe/src/Makefile.am ++++ b/xlators/cluster/stripe/src/Makefile.am +@@ -2,7 +2,7 @@ + xlator_LTLIBRARIES = stripe.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster + +-stripe_la_LDFLAGS = -module -avoid-version ++stripe_la_LDFLAGS = -module -avoid-version -shared + + stripe_la_SOURCES = stripe.c stripe-helpers.c \ + $(top_builddir)/xlators/lib/src/libxlator.c +diff --git a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am +index 5075c59..a7681c4 100644 +--- a/xlators/debug/error-gen/src/Makefile.am ++++ b/xlators/debug/error-gen/src/Makefile.am +@@ -2,7 +2,7 @@ + xlator_LTLIBRARIES = error-gen.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug + +-error_gen_la_LDFLAGS = -module -avoid-version ++error_gen_la_LDFLAGS = -module -avoid-version -shared + + error_gen_la_SOURCES = error-gen.c + error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am +index 332d790..bf62017 100644 +--- a/xlators/debug/io-stats/src/Makefile.am ++++ b/xlators/debug/io-stats/src/Makefile.am +@@ -2,7 +2,7 @@ + xlator_LTLIBRARIES = io-stats.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug + +-io_stats_la_LDFLAGS = -module -avoid-version ++io_stats_la_LDFLAGS = -module -avoid-version -shared + + io_stats_la_SOURCES = io-stats.c + io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am +index 7b2597b..2030ed4 100644 +--- a/xlators/debug/trace/src/Makefile.am ++++ b/xlators/debug/trace/src/Makefile.am +@@ -2,7 +2,7 @@ + xlator_LTLIBRARIES = trace.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug + +-trace_la_LDFLAGS = -module -avoid-version ++trace_la_LDFLAGS = -module -avoid-version -shared + + trace_la_SOURCES = trace.c + trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am +index 94e8d18..d13894e 100644 +--- a/xlators/encryption/rot-13/src/Makefile.am ++++ b/xlators/encryption/rot-13/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = rot-13.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption + +-rot_13_la_LDFLAGS = -module -avoid-version ++rot_13_la_LDFLAGS = -module -avoid-version -shared + + rot_13_la_SOURCES = rot-13.c + rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am +index 73bb897..5519798 100644 +--- a/xlators/features/index/src/Makefile.am ++++ b/xlators/features/index/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = index.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features + +-index_la_LDFLAGS = -module -avoid-version ++index_la_LDFLAGS = -module -avoid-version -shared + + index_la_SOURCES = index.c + index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am +index 8908c1f..1a17a0f 100644 +--- a/xlators/features/locks/src/Makefile.am ++++ b/xlators/features/locks/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = locks.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features + +-locks_la_LDFLAGS = -module -avoid-version ++locks_la_LDFLAGS = -module -avoid-version -shared + + locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \ + clear.c +diff --git a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am +index f8567ed..a283eb0 100644 +--- a/xlators/features/mac-compat/src/Makefile.am ++++ b/xlators/features/mac-compat/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = mac-compat.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features + +-mac_compat_la_LDFLAGS = -module -avoid-version ++mac_compat_la_LDFLAGS = -module -avoid-version -shared + + mac_compat_la_SOURCES = mac-compat.c + mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am +index a7c6764..477fe0f 100644 +--- a/xlators/features/marker/src/Makefile.am ++++ b/xlators/features/marker/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = marker.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features + +-marker_la_LDFLAGS = -module -avoid-version ++marker_la_LDFLAGS = -module -avoid-version -shared + + marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c + marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am +index 15e4662..b3cd9d1 100644 +--- a/xlators/features/quiesce/src/Makefile.am ++++ b/xlators/features/quiesce/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = quiesce.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features + +-quiesce_la_LDFLAGS = -module -avoid-version ++quiesce_la_LDFLAGS = -module -avoid-version -shared + + quiesce_la_SOURCES = quiesce.c + quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am +index 9546f42..4cfa983 100644 +--- a/xlators/features/quota/src/Makefile.am ++++ b/xlators/features/quota/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = quota.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features + +-quota_la_LDFLAGS = -module -avoid-version ++quota_la_LDFLAGS = -module -avoid-version -shared + + quota_la_SOURCES = quota.c + quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am +index 4c14621..a3f79fa 100644 +--- a/xlators/features/read-only/src/Makefile.am ++++ b/xlators/features/read-only/src/Makefile.am +@@ -4,12 +4,12 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features + + noinst_HEADERS = read-only-common.h + +-read_only_la_LDFLAGS = -module -avoid-version ++read_only_la_LDFLAGS = -module -avoid-version -shared + + read_only_la_SOURCES = read-only.c read-only-common.c + read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +-worm_la_LDFLAGS = -module -avoid-version ++worm_la_LDFLAGS = -module -avoid-version -shared + + worm_la_SOURCES = read-only-common.c worm.c + worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am +index df15453..d03d653 100644 +--- a/xlators/mgmt/glusterd/src/Makefile.am ++++ b/xlators/mgmt/glusterd/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = glusterd.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt + glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\"" +-glusterd_la_LDFLAGS = -module -avoid-version ++glusterd_la_LDFLAGS = -module -avoid-version -shared + if ENABLE_BD_XLATOR + glusterd_la_LDFLAGS += -llvm2app + endif +diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am +index 653121d..3f221d8 100644 +--- a/xlators/mount/fuse/src/Makefile.am ++++ b/xlators/mount/fuse/src/Makefile.am +@@ -24,7 +24,7 @@ endif + fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ + $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) + +-fuse_la_LDFLAGS = -module -avoid-version ++fuse_la_LDFLAGS = -module -avoid-version -shared + fuse_la_LIBADD = @GF_FUSE_LDADD@ + + AM_CPPFLAGS = $(GF_CPPFLAGS) \ +diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am +index 2795a93..2614822 100644 +--- a/xlators/nfs/server/src/Makefile.am ++++ b/xlators/nfs/server/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = server.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs + nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src +-server_la_LDFLAGS = -module -avoid-version ++server_la_LDFLAGS = -module -avoid-version -shared + server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \ + nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \ + nlmcbk_svc.c mount3udp_svc.c acl3.c +diff --git a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am +index 155be99..ba0738c 100644 +--- a/xlators/performance/io-cache/src/Makefile.am ++++ b/xlators/performance/io-cache/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = io-cache.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance + +-io_cache_la_LDFLAGS = -module -avoid-version ++io_cache_la_LDFLAGS = -module -avoid-version -shared + + io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c + io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am +index d63042e..aba1fdb 100644 +--- a/xlators/performance/io-threads/src/Makefile.am ++++ b/xlators/performance/io-threads/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = io-threads.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance + +-io_threads_la_LDFLAGS = -module -avoid-version ++io_threads_la_LDFLAGS = -module -avoid-version -shared + + io_threads_la_SOURCES = io-threads.c + io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am +index 8c9f5a8..4d714fa 100644 +--- a/xlators/performance/md-cache/src/Makefile.am ++++ b/xlators/performance/md-cache/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = md-cache.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance + +-md_cache_la_LDFLAGS = -module -avoid-version ++md_cache_la_LDFLAGS = -module -avoid-version -shared + + md_cache_la_SOURCES = md-cache.c + md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am +index 1252857..568434a 100644 +--- a/xlators/performance/open-behind/src/Makefile.am ++++ b/xlators/performance/open-behind/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = open-behind.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance + +-open_behind_la_LDFLAGS = -module -avoid-version ++open_behind_la_LDFLAGS = -module -avoid-version -shared + + open_behind_la_SOURCES = open-behind.c + open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am +index 4906f40..8d42116 100644 +--- a/xlators/performance/quick-read/src/Makefile.am ++++ b/xlators/performance/quick-read/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = quick-read.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance + +-quick_read_la_LDFLAGS = -module -avoid-version ++quick_read_la_LDFLAGS = -module -avoid-version -shared + + quick_read_la_SOURCES = quick-read.c + quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am +index be80ae7..eae0540 100644 +--- a/xlators/performance/read-ahead/src/Makefile.am ++++ b/xlators/performance/read-ahead/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = read-ahead.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance + +-read_ahead_la_LDFLAGS = -module -avoid-version ++read_ahead_la_LDFLAGS = -module -avoid-version -shared + + read_ahead_la_SOURCES = read-ahead.c page.c + read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am +index 4091c32..0d600d6 100644 +--- a/xlators/performance/symlink-cache/src/Makefile.am ++++ b/xlators/performance/symlink-cache/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = symlink-cache.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance + +-symlink_cache_la_LDFLAGS = -module -avoid-version ++symlink_cache_la_LDFLAGS = -module -avoid-version -shared + + symlink_cache_la_SOURCES = symlink-cache.c + symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am +index 6c829d8..746e5c1 100644 +--- a/xlators/performance/write-behind/src/Makefile.am ++++ b/xlators/performance/write-behind/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = write-behind.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance + +-write_behind_la_LDFLAGS = -module -avoid-version ++write_behind_la_LDFLAGS = -module -avoid-version -shared + + write_behind_la_SOURCES = write-behind.c + write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am +index 426e7c2..fa7234d 100644 +--- a/xlators/protocol/auth/addr/src/Makefile.am ++++ b/xlators/protocol/auth/addr/src/Makefile.am +@@ -1,7 +1,7 @@ + auth_LTLIBRARIES = addr.la + authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth + +-addr_la_LDFLAGS = -module -avoid-version ++addr_la_LDFLAGS = -module -avoid-version -shared + + addr_la_SOURCES = addr.c + addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am +index d84db91..022739d 100644 +--- a/xlators/protocol/auth/login/src/Makefile.am ++++ b/xlators/protocol/auth/login/src/Makefile.am +@@ -1,7 +1,7 @@ + auth_LTLIBRARIES = login.la + authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth + +-login_la_LDFLAGS = -module -avoid-version ++login_la_LDFLAGS = -module -avoid-version -shared + + login_la_SOURCES = login.c + login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am +index cf89d42..8f2612c 100644 +--- a/xlators/protocol/client/src/Makefile.am ++++ b/xlators/protocol/client/src/Makefile.am +@@ -2,7 +2,7 @@ + xlator_LTLIBRARIES = client.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol + +-client_la_LDFLAGS = -module -avoid-version ++client_la_LDFLAGS = -module -avoid-version -shared + + client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ +diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am +index 25d6706..15a2548 100644 +--- a/xlators/protocol/server/src/Makefile.am ++++ b/xlators/protocol/server/src/Makefile.am +@@ -1,7 +1,7 @@ + xlator_LTLIBRARIES = server.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol + +-server_la_LDFLAGS = -module -avoid-version ++server_la_LDFLAGS = -module -avoid-version -shared + + server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ +diff --git a/xlators/storage/bd_map/src/Makefile.am b/xlators/storage/bd_map/src/Makefile.am +index 91412e9..5c59626 100644 +--- a/xlators/storage/bd_map/src/Makefile.am ++++ b/xlators/storage/bd_map/src/Makefile.am +@@ -3,7 +3,7 @@ if ENABLE_BD_XLATOR + xlator_LTLIBRARIES = bd_map.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage + +-bd_map_la_LDFLAGS = -module -avoid-version ++bd_map_la_LDFLAGS = -module -avoid-version -shared + LIBBD = -llvm2app -lrt + bd_map_la_SOURCES = bd_map.c bd_map_help.c + bd_map_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) +diff --git a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am +index 88efcc7..79ca903 100644 +--- a/xlators/storage/posix/src/Makefile.am ++++ b/xlators/storage/posix/src/Makefile.am +@@ -2,7 +2,7 @@ + xlator_LTLIBRARIES = posix.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage + +-posix_la_LDFLAGS = -module -avoid-version ++posix_la_LDFLAGS = -module -avoid-version -shared + + posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c + posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO) +diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am +index 11c939f..561c52d 100644 +--- a/xlators/system/posix-acl/src/Makefile.am ++++ b/xlators/system/posix-acl/src/Makefile.am +@@ -1,6 +1,6 @@ + xlator_LTLIBRARIES = posix-acl.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system +-posix_acl_la_LDFLAGS = -module -avoid-version ++posix_acl_la_LDFLAGS = -module -avoid-version -shared + posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c + posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +-- +1.8.2.1 + diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-parallel-build.patch new file mode 100644 index 000000000000..61931da70e50 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-3.4.0-parallel-build.patch @@ -0,0 +1,27 @@ +From 54010c34747e410f8332d1f4f85dcc2914836a88 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch> +Date: Fri, 26 Jul 2013 13:34:40 +0200 +Subject: [PATCH] Add workaround for broken parallel install with _LTLIBRARIES. + +--- + api/src/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/api/src/Makefile.am b/api/src/Makefile.am +index 8980c02..0782435 100644 +--- a/api/src/Makefile.am ++++ b/api/src/Makefile.am +@@ -17,6 +17,10 @@ libgfapi_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ + + xlator_LTLIBRARIES = api.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount ++# workaround for broken parallel install support in automake with LTLIBRARIES ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 ++install_xlatorLTLIBRARIES = install-xlatorLTLIBRARIES ++$(install_xlatorLTLIBRARIES): install-libLTLIBRARIES + + api_la_SOURCES = glfs-master.c + api_la_DEPENDENCIES = libgfapi.la +-- +1.8.2.1 + diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch new file mode 100644 index 000000000000..1b79e0d079e4 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch @@ -0,0 +1,23 @@ +--- configure.ac 2013-07-12 19:43:26.000000000 +0200 ++++ configure.ac2 2013-07-25 13:58:48.294091861 +0200 +@@ -10,20 +10,6 @@ + + AM_INIT_AUTOMAKE + +-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) +- +-if make --help 2>&1 | grep -q no-print-directory; then +- AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory"; +-fi +- +-if make --help 2>&1 | grep -q quiet; then +- AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet" +-fi +- +-if libtool --help 2>&1 | grep -q quiet; then +- AM_LIBTOOLFLAGS="--quiet"; +-fi +- + AC_CONFIG_HEADERS([config.h]) + + AC_CONFIG_FILES([Makefile diff --git a/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild new file mode 100644 index 000000000000..4726a67c0866 --- /dev/null +++ b/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild,v 1.1 2013/07/26 11:43:00 dev-zero Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator + +DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" +HOMEPAGE="http://www.gluster.org/" +SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" + +LICENSE="|| ( GPL-2 LGPL-3+ )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax" + +REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="bd-xlator? ( sys-fs/lvm2 ) + emacs? ( virtual/emacs ) + fuse? ( >=sys-fs/fuse-2.7.0 ) + georeplication? ( ${PYTHON_DEPS} ) + infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) + systemtap? ( dev-util/systemtap ) + sys-libs/readline + dev-libs/libaio + dev-libs/libxml2 + dev-libs/openssl + || ( sys-libs/glibc sys-libs/argp-standalone )" +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/bison + sys-devel/flex" + +SITEFILE="50${PN}-mode-gentoo.el" + +PATCHES=( + "${FILESDIR}/${PN}-3.4.0-silent_rules.patch" + "${FILESDIR}/${PN}-3.4.0-build-shared-only.patch" + "${FILESDIR}/${PN}-3.4.0-parallel-build.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README THANKS ) + +# Maintainer notes: +# * The build system will always configure & build argp-standalone but it'll never use it +# if the argp.h header is found in the system. Which should be the case with +# glibc or if argp-standalone is installed. + +pkg_setup() { + use georeplication && python-single-r1_pkg_setup +} + +src_configure() { + local myeconfargs=( + --disable-dependency-tracking + --disable-silent-rules + --disable-fusermount + $(use_enable debug) + $(use_enable bd-xlator ) + $(use_enable fuse fuse-client) + $(use_enable georeplication fuse-client) + $(use_enable infiniband ibverbs) + $(use_enable static-libs static) + $(use_enable systemtap) + --docdir=/usr/share/doc/${PF} + --localstatedir=/var + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + + use emacs && elisp-compile extras/glusterfs-mode.el +} + +src_install() { + autotools-utils_src_install + + rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed" + insinto /etc/logrotate.d + newins extras/glusterfs-logrotate glusterfs + + if use emacs ; then + elisp-install ${PN} extras/glusterfs-mode.el* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim + insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim + fi + + if use extras ; then + sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed" + for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do + newbin extras/${e}.sh ${PN}-${e} + done + newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync + fi + + newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd + newinitd "${FILESDIR}/glusterd-r1.initd" glusterd + newconfd "${FILESDIR}/${PN}.confd" glusterfsd + + keepdir /var/log/${PN} + keepdir /var/lib/glusterd + + python_fix_shebang "${ED}" +} + +pkg_postinst() { + elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" + elog "volumes dynamically. To do so, simply use the gluster CLI after running:" + elog " /etc/init.d/glusterd start" + elog + elog "For static configurations, the glusterfsd startup script can be multiplexed." + elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" + elog "separate service. To create additional instances of the glusterfsd service" + elog "simply create a symlink to the glusterfsd startup script." + elog + elog "Example:" + elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" + elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" + elog "You can now treat glusterfsd2 like any other service" + elog + ewarn "You need to use a ntp client to keep the clocks synchronized across all" + ewarn "of your servers. Setup a NTP synchronizing service before attempting to" + ewarn "run GlusterFS." + + elog + elog "If you are upgrading from a previous version of ${PN}, please read:" + elog " https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/" + + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml index 3d5fc7492f17..e2e977861bc7 100644 --- a/sys-cluster/glusterfs/metadata.xml +++ b/sys-cluster/glusterfs/metadata.xml @@ -6,9 +6,12 @@ GlusterFS is a cluster file-system capable of scaling to several peta-bytes. It aggregates various storage bricks over Infiniband RDMA or TCP/IP interconnect into one large parallel network file system. GlusterFS is based on a stackable user space design without compromising performance. </longdescription> <use> + <flag name='bd-xlator'>Enable the blockdevice translator (requires <pkg>sys-fs/lvm2</pkg>)</flag> <flag name='fuse'>Add FUSE mount helper</flag> + <flag name='georeplication'>Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag> <flag name='extras'>Install extra helper scripts</flag> <flag name='infiniband'>Add support for Infiniband ibverbs transport. Libraries can be found in science overlay</flag> + <flag name='systemtap'>Enable support for <pkg>dev-util/systemtap</pkg></flag> </use> </pkgmetadata> |