diff options
Diffstat (limited to 'sys-fs')
75 files changed, 10 insertions, 9617 deletions
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 28692126301e..9166991f3e1c 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,68 +1,9 @@ -AUX zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch 1371 SHA256 f48710ba112304d994785b9fe29c973e4dbeaf4db5e73f0147e1e2ecf10cb9c4 SHA512 16828602d72f57a88dc1247e6107c61bb50db3a694f825eefa27d67aaa2cdc3ea0d6e0542d90e31ca399d4793261c2d9b8c304f3e6b55b6eeea7a95759e69539 WHIRLPOOL 87bc1890e099e97af4d57092ca5fabdccf2abe25bea73f0f8113b9ec587bf5f39e96ca1a1246dcad6827830e0535f19994576027863102325111f43c899ecd84 -AUX zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch 1161 SHA256 f74db8f9704f35d460a1a2250993057d301710c065e553c688381e778fb8e320 SHA512 9a16107d448c90914e9e1fc767c68eba7fb3793c1a7b1e26182759d0b398d09641f51911981a1092e76223cd8a56724c634bc939e9f1fdc412cf4e469e1e9384 WHIRLPOOL ccd43c7610420c165ac19684217fc8d2aa6b5e95d3fa40dec651ea1bf145f9ec0463ff806f918678636d2658dc6c80946077d5773f7486e4d68c13ad3cb1960c -AUX zfs-kmod-0.6.0_rc13-gcc-4.7-compat.patch 1882 SHA256 bd691dfdb8379c276309715b597b2091595c0f177a2241249ec76f6e31f3f101 SHA512 7f24915fdacaca01620a961febcc524b4c40989e85754cc927df5d8d87b77ba6bcce919db54fd7e42646abf16b6b29349de5e8dc30b5c12a9744e7321a9280e4 WHIRLPOOL 432182663ba978f1ae530a27d7f813e7aba04380763354a5446933c53848abaca738145c316b4c6c5fee06e65812b4e210def8a6432f7f5a8c845f4334b09d5b -AUX zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch 1068 SHA256 4fba06f71807086da90c9d8f4c2a04cd83af4b606ab2ab9a4bc22f08e9439861 SHA512 8f1d20ab9be3ae388424ad543d400244df9ad093a0e2c61243c6b481347cd2fc0ab194ace5062d4ef6d162622324a5ed14c43c8c6c4e63d56725624f86a3961e WHIRLPOOL 4edda0e2353e851fdfc8381d9ab91c3c68d7c7f60dd69778817a9aeea46ba8b15e51954ccc5c49c4e094063d3bf350f14e2ab49fed9837980772a2eb495cf2af -AUX zfs-kmod-0.6.0_rc14-flush-properly.patch 1058 SHA256 becf3bd60019415281f38633ad10d9a4b57587aa8b9d0679dfd7aa83ae76092b SHA512 5ffe861de9d7ff54a1108a08a1c077e9f2eb1266fe72a60d4b790be463714a6736fc8b96168d656192bdcd7a0d836e5d09dd04aba3dbdb7370a682542be68a35 WHIRLPOOL 2cc7619a3e76abedd0b77427f408562c5f7206f904dc40a58f2aa519305820c121ceea53311f747ea1f103bcedd5cf88cb27cf8bdfda6b43f879f35855a8724d -AUX zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch 3841 SHA256 0c456d53f0f5c861fc3b92122290f9ae8dc90af9469bd66f35f5ad802a037f4a SHA512 985d1d3359cec0c5752adebd398e241e2b7cfe174ac500e2c66e84c960bddfc8908f6de19468f628f2752434f4987ea926842cc40c4268a9a18376d1c1c04460 WHIRLPOOL d3ee7ac7cd3711db31229a45b33cf0eeceae6a9710a4b5befb9ac4734bc0a8dcedc37a38d497827430e99282feaea8200b4b54295228238e9b39750c179d39a3 -AUX zfs-kmod-0.6.0_rc14-improved-hardened-support.patch 17568 SHA256 1155f2587e249fe2b80e887c10549da11dc0ccb2f1a86d7bf4ad37bc73eeede1 SHA512 0d7a3354a336a749be0aeb1781f9c78ac3037ad515e31039184fc13075ec10b237581d25d6eddf5c0bf9b9b49b137d73c0ad9685d544fa8f8a7200463300acfb WHIRLPOOL 365e07900bc89fde7624f987ecdbc5ce55cebe1318f60062ae0c36ad044cb2911af81a57886d958237b01de12b865cef3377b7cce8e760a55abc2ec4fbde0379 -AUX zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch 1098 SHA256 3572e68fabdaea723a2f31e109fe17646c966e12e2c99364798fdcae1ec63b3f SHA512 c59a09d741549192bfb9433e4ab9ed2c42e8346c5c0eb7accd76a40edc8b50f3c49f9dab69c66e2c4fce4d9b62961121512c475ab7b9fd9f8d821ce1075dd309 WHIRLPOOL b4f29f80ba433196d12b2c4b0945841f6282d5def9eeaf4b59f032fd57042073d437b33a1ae849bc2323af3a0cc16f23808825f2fcccbc7bd1a2b8a98cfbb5d2 -AUX zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch 1074 SHA256 ca1efba212bdec982d519a05c81035271440a43f2aa6333c3e7f244690fbbdcc SHA512 0df3ca10c9919d554c197a45a0fc9217db19f6de39db6d00ff1f6501857430df79e9403c924c34928dc236adf73a5ce9bdc80b877a62709d4591a1fbab2c87fa WHIRLPOOL 3fe58a362d1c0fb0c8aa30bbec4a43d88d95b6c956445246ed8f28ae890c2fcc2b13de184eba91937e1ff8ac93b38a3f0b6824733da45cf46999e23b51f31d9a -AUX zfs-kmod-0.6.0_rc14-zfs_arc_memory_throttle_disable.patch 1354 SHA256 0d3690d53b7e3065198da6b0356c1b903f04c5f69f7097e0735a3af221d122d0 SHA512 816f7e52f6c97a06bd0cd28a6bed8c8d1f29be6c45a4b41a7e2090c796cdd5d519fde333d1932e959fde70ef9ecfdc1c8c9231c56d935a2c34b3e3897e0c7a94 WHIRLPOOL 52c1224114767957ef9211ebe73a64ededfd6d6bd6aada2470b3e916cae4a18f87eb8710a716cea55a6eae987efc250d3496d04eefb250335c031827b13ec08b -AUX zfs-kmod-0.6.1-fix-arc-read-panic.patch 1432 SHA256 2a2fb2a0b4960e7c616f4bb27a2a1ddf6dfcef30eb6b22ead20d70fe58055c1e SHA512 6063ad756aac5df4b850fb79630696f0616e3a906463bdce147b07383ed1cba47a60e02eac3cc2888fb92f9915e6ff8e28ca36c4e3d11cc9e65391c68a79d972 WHIRLPOOL 4d0432ca6468d44de7a870e03d20497eeb39b1e373d843862a695622b9d69e8eff6f3d52471b7756f80c9392ae12a797b6665c4d27f73710f67f0ee1aaafcbad -AUX zfs-kmod-0.6.1-fix-getdents.patch 971 SHA256 c55cc963c0a5e9d42b7462c18b3be25af0020284652f3a2c7e1901eaca2567f7 SHA512 e5c41547ee1ee0e6aa67555501d8a6e18bbbe294c1b2deb6ce7af5efb07857d07acf2590867e64cd46f4abb0732b1048ad9edd8b30ad787d302ad3f6ec6284b2 WHIRLPOOL 7912eb4833acde65b6a12537dd0d34941ccdd8b23de4c80757d36059a3654a18c843ca4125a4acba175e13b93a7c0af4353dffa1e55429d2b6af8ceee2e96674 -AUX zfs-kmod-0.6.1-fix-txg_quiesce-deadlock.patch 2368 SHA256 af06930be9d5b7a068edb7a6b2971ca64083f3d7f2e8a1030d4828aa4ea5095a SHA512 2c439a1373f30974154d990225e3207c01ac66261fda4457e05744cddff9dabf86deeff30e68834669487accf26ea502851dc11f370e84e0f14112adc7838bd6 WHIRLPOOL 7ad335596f02e07ad3a6c5ee721384c50336c544597b0272052ee7d58c597760bbd1f56f7edf1197ca939cfce53ffefb415704d9b8034a8f38797496c62fdc5b -AUX zfs-kmod-0.6.1-fix-xattr-behavior-1.patch 1218 SHA256 785b3649ec53aef5598b75e36686ee392541492b40221d468abf442c5eb0959d SHA512 f98ae5bf59ff84af3fe91b8d1589d4eac2588542007a7185b91dc40abf0f54f0b001d3614bfad342510ff2228fb79bb0275991e7d9ecfabf42659c5839737cc2 WHIRLPOOL e9e8512fb9e96d71e586d110e4db69dd49f42dcc59b62851c66541a5faf339665d7f99beb40357ed912daff6f85b7a75e92414cc4a8a65e3b634f8b56543c225 -AUX zfs-kmod-0.6.1-fix-xattr-behavior-2.patch 1205 SHA256 91e6e0e90504b5f71bcd4daae567b7f8830d6df21eefe299b03b6e3263fd1764 SHA512 23ce8867de27d8402b33ae672d009fabad8faa8a994021c745582aecad28519eeff3902503abb8842b04a649f720532535191fe16a53014157dfd89f55d95615 WHIRLPOOL 2fbe1ee885d53102dbdb22203ec7372039972e3e94b047134367c60e81dad28a845930e2d6cbbe22e2171dbd6cf56f9d91bf219b3e0c5f87ebc623518affc175 -AUX zfs-kmod-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch 1786 SHA256 93524ad27a8a675833a4d0f31d023aa1f19df971e3224597fe2b8ba0b1cd7917 SHA512 d0da1ae4eaa8a11d7af58cbbbb97e9e7fc2e314f5cb41725e1178fa5a8ae60c8791713468faf11d64d5e8bf4720d37c014e38f5f353f844f9cb2ac4718274322 WHIRLPOOL 97b82c29ad786171cb18323b3f643ec1fa62057041b13e63b9257243e715775616140b01b3d1d5260770778760ceb9afe2f77f48820de0c06eee6253ede2f953 -AUX zfs-kmod-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch 2503 SHA256 f971fddca8a1b9da357fef42171230cf754649cffa45e59ce0c6610776737c29 SHA512 dbf9ef69262aba1a449c528145dcfc5bc4f9bc0ec46f1a04073d99d83c586ff8d76d788d6d2d798c98af8a22264db3969810711c5830cd3d64392de7c4f9bf91 WHIRLPOOL 73e5de6aafebf54b6fb1c5cc036252299d353c326fbd1e34c08e7ec7167ca064cb769c84a20ee12bf5b799d57cf191cead2cf996177f9dd542d1f7b0d57e872e -AUX zfs-kmod-0.6.1-fix-zvol-initialization-r1.patch 4803 SHA256 36f778dc0fa3c3c7aa4f2383e9463a75c51da19a1a719018f729e9d42ffb52ed SHA512 bfe5ee1185fe044cbf758414b0c8bc4311de6b0502a6f0c6a8fecec71402376f0ab4aa7e798f870c262f54d77f6b84590cc2ae371ff4880dcd97b834ac443483 WHIRLPOOL 3932ef6eea9ed0f23146f980504540843b04a684d5c55cdb5aec60d9fdb18354d61e485b55f5a0f2561ed3e379accd6b3d3f7c39bdbc91bc0d3194546e75ec5e -AUX zfs-kmod-0.6.1-linux-3.10-compat.patch 3513 SHA256 e1e4773f78faf53b591437dc4222c343a6a970e8c4e3a25a441cf8c32dcf66ef SHA512 aa0ee37ec071e1732533d620d88d47219d33579b164bcc3ef9ed92a68060e4587d171fa59f759c77799fc2112ceef494c201eed2614c8eed49808dfc09b8fe68 WHIRLPOOL ede846f6b8ce91a1c558693e36b3d7676096e27fae4db0a4139b7a4b79589158c3d834e4dbcaf4c4de3f6ca5d1742f715fa2cca2fdea069f286654618a1c1bdf -AUX zfs-kmod-0.6.5-discard-on-zvol-fix.patch 966 SHA256 3770a47646e35f9c5cd35bce49a8145905aaf5f005ee6ecec9054597095357cc SHA512 5de4a48727cdb21c3851a3310545eb9ab353c732df891d50f1c02da9d3db0a5104a1e6dd660fcdf73c0fe315e6694fa6f3932a76c90074126e723814e65fb6de WHIRLPOOL 81b2070f7c53eb6765c02ec833246b0c92832515a92b6a172c4687dfeedb08eac5fb98a984d61d90379ece52ab9da573acd877efcde045235b2f29c575548706 -DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798 -DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d -DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b -DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58 -DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50 -DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe -DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1 -DIST zfs-0.6.5.10.tar.gz 2597676 SHA256 90a0ca76667076e9f58776216cb761f68761eb0192f8b0c45893f84cabc6f27e SHA512 822004d11a1a7c0e258cce049bfee0248dd1ac225a922c1e4a25c8593f23e9b1d7aa4a45a1122f6904025ea0a8c7f4884ec4ab353bfa9c734aedb0969b8d6eb4 WHIRLPOOL 87596a0e89afd3b7da1476c996c87491ee3962f0accd0c1a50d9cd9ab4dd49b3c1c71e14c6eeeddfc53db9bba665bc525ef9580da8082b1e4426bce54ee83401 DIST zfs-0.6.5.11.tar.gz 2521959 SHA256 136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 WHIRLPOOL 867f6b22726ca13e43a5ff7a832610bbfd44e6c367bd314a20a7f0a03364b1c3bda1d7b3d7c3502e08249b8d8d9e8034e93d0200abb70f793352f7689e19deac -DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634 -DIST zfs-0.6.5.3-patches-p3.tar.xz 88736 SHA256 031cd97765f890d9b78e1a5746cbd2a3ce06c7208693ec75c0b47324ac67b97a SHA512 8f17cc6e02a35828a57a7c2a437d9d18a41203b6e3f9e154b2ab863296b64596dc827afeeb0f993e37f47881d0f2ed4834f270d0ba843ab84b21c491cc352576 WHIRLPOOL 20f69c0a936bb612d5e3b551d4bf904aca3aff6d885d72f67f3b14cd720094ec13e383032ee4e322b0e81017d8ffcfafb47bf07f273badef34f7210d687ddacc -DIST zfs-0.6.5.3.tar.gz 2524218 SHA256 49e6f9760ea172cb756f7357e4bcb90ee0293028540a68d62ed087724276131f SHA512 325cb91b7ddbcd6aa0bb9fc41eb0099dbb047a4e32d096fd414799729ef68cbc9c2e15714092eff8044a681af4ab552bd9ac1949cc673c6c5c3de1a23d9895ec WHIRLPOOL 957c3a75bb11befd4b74583883f2f11f717deb6bda368939b342049e809aa191a9ee8d1e709eaddc2a831418c7fdb5e763f918ff56d45f03baf4569ef8a4a070 DIST zfs-0.6.5.4-patches-p1.tar.xz 64004 SHA256 83877d9b7c629730838325fd5b16bcb54259520e200f0539de9b8edfdcee9403 SHA512 9203356b43bdad2ed78c946af8c95c9fc4d2996b41a09a3b1f5a8657d2742ac69d10b4a87d443db497d591878cf7a70ebb19762b0df135ee25f4e8d2ed6ad71f WHIRLPOOL ff5788356d6a85608d22ea2c010a799464922614204c7eea06b57930a44ee876e596a053a773205de0543d36c04337d60c32594939e8e64d3022906c51c4d4e6 DIST zfs-0.6.5.4.tar.gz 2506470 SHA256 780862ec2301ccace412a324787e9df762cff6046e73e2ac0ebdce9e2bd59b0f SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01 WHIRLPOOL eacd2ec09afdbc3f6d946583116296fadcd7d0dea5158c89f82f6d0b02e0cbf075712015bfa5f321ae5815cf86af13b39ce93e5026e6a00da58d9ddb04d12320 -DIST zfs-0.6.5.6.tar.gz 2561093 SHA256 c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff SHA512 94c55a50f0f9a90ce07a45dc72bb2730b2a41373ab5a12845df00ef38bb22e4a80ab2fb6e31a9c3a45e51516cdea441bb9da1d0acf71f2f88b38c7c3e9e995b0 WHIRLPOOL 6fcbe473bfce90f800989bac506fa6d4cf5662ad9ca617a477f1251c1625de906495a45759d6190e5a24dcf05f2ed3dd7ea1c0b2f243165a60e5efd098082935 -DIST zfs-0.6.5.7.tar.gz 2537816 SHA256 4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590 SHA512 559b826ae1a176217b92d8407729e2c5feeffb117dc9affaa8c9c2134d996b6c3cbe095f7a0c4666c9b131742491f1304eeb292e13e0df0b6d001fa620568af2 WHIRLPOOL bf2e0865de35496cc995738ddde34df797b0c5047c0dd17e5b755803ef16e7c16f8ba89927106a1f6131c2f75a6749c31a72dff95fc0fee186b308c50ce0b4f4 -DIST zfs-0.6.5.8.tar.gz 2521921 SHA256 d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84 SHA512 e5b53a9531b865e7c650892c0deb1ee81db086a33538cd667a087a8a8d33a0ad93a30ae5e800096abfc4dc8ed00843da924230082e204fb7543dd401ef41fcde WHIRLPOOL 623bf8ee51d59dcd1842bf41ccf19c2eb6813fb1e88dea1ea1c6f1388c11484b798546bdcb94500735a0e9e5f9099a4df43308760b353b5b62ff56af035f88bd -DIST zfs-0.6.5.9.tar.gz 2610650 SHA256 b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f SHA512 6e175f32421cf0f9e13429f12f0fac0564dc7059ab076831d0ebc4f6a17412160ca3526ebdf894bc7666e82580355b08701dd01c411d3177f82e7330b4529a37 WHIRLPOOL 149d730a26363b50691363b314669756d218c4a16e6d06e319c2b0866c5f8ed6e2da2396a516297c127d3343d51d78072d8b7371e3f4d327d30fa43c90be5cd3 -DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24 -DIST zfs-0.7.0.tar.gz 6714094 SHA256 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2 SHA512 6e6cbf54399fc85b74b76a6ceb3f30e94903f755fe6386fccc56b5e6d307a907759e4b62acec5d32e8383ef1083423eaff8dee2b0ef01a99459171a42b47d217 WHIRLPOOL 74687be4220bab51f18fdd3c047400c4261acf16f38086c2485f5cb9d79af87f5adfafced92860b021814aece7446cb18e9ca310a363b90c6bac39343b72a4b6 -DIST zfs-0.7.1.tar.gz 6376234 SHA256 231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6 SHA512 64b0a3b5eeaf09ce824e3e029880a8e5dcb3e4567d1fb2fa24c89d8e55fee1ebe2d2f3a9f77d5468cc5637074e27d5ba7696b566829c93fd69c610b288200a37 WHIRLPOOL 700c83aadca96578ae8d6a9795f91c0c25b69afcc6ec6c02141daafcbcd550ae413438e96c4821c5c90816e0e29366ecfc3e7289623f14c255722c37d9f9a7f6 -DIST zfs-0.7.2.tar.gz 6389699 SHA256 f75f4d8bbb8241e3d06321b53914e53fa22d1ccc8be89819b578b46e5d3e5cf4 SHA512 fd10350b3ba5906b8d4968cee4f9febcc475b49e7d5499209566f7cfa39f29c4c2c1a4bae0698ce98244fa66657e7956a8c170de1e5f13b1bc05d2861d2c7722 WHIRLPOOL b1e270bddf9d34a6d60a9f3d80f767d6a19a7c2ae5b51d3fe83fb28432e267d494cd5b4f003b6049a074e8bf65fa9179793dec0b40f366cea493f7993dd3d19d DIST zfs-0.7.3.tar.gz 6393145 SHA256 cb8fc606835d3f91471e49aca31a6a0a71733b1cbe74fa510e0fe0efa670fe51 SHA512 fe116fd787050f7bc099fe3ed5335c2d18711e5e665af5be13b3971939258e036e273432e80106e704f037d1f6e3114b12e26b01f97b575723f8bd46acdcbf61 WHIRLPOOL 4a7442898bd8855c24c8cdbd8d58b02dfb41ba5e55096ad20afb61c9a2903fd5aa7808fa525dfaaa20bd85ab05e1f44828f8c557ee15c7f2b5dd1174b1810e63 -DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9 -EBUILD zfs-kmod-0.6.0_rc13-r4.ebuild 2918 SHA256 6ea818295d86269658cdd0f738ad1985b7e341fc1299b767d7ff097fec64cac4 SHA512 0181b33ef6c7be9d04ea82a70f4fad9d1857c0399afb990ee896a84abd8a39f56ae2cfa2c685fa12f3b7566cf1e22c4dfa3b11d7e8c1430ef6966ca2b76e5879 WHIRLPOOL 106c05b0563e4812beec09b4295216fff0f508cbdbad506256997254151ce89be341a26c6d7a363dce414cee264ad54c2329a54809bbf49cbcac91b24eea7c0e -EBUILD zfs-kmod-0.6.0_rc14-r5.ebuild 3545 SHA256 23e7f9dcdbc7def3170da5b2fba746f937084b5afd956f34698a33c9d0892dbe SHA512 b583ef7334962c967df9ea21cac71ff761373770dd861faf8416d78f33531573fdceb5f974526f02cb4a8a298657e4773ebca6c2079b2c08df34035bf2c3ccf6 WHIRLPOOL 86e214049e54eb6e20659907778f08fb8debc328f302a2dfd7eaf81d8bcc3a915c4ccea29ff3a42b9ece6b8386505ad898b36a21363d978f6433e295f6d016c7 -EBUILD zfs-kmod-0.6.1-r2.ebuild 4153 SHA256 e17f389040047f15ac0bbd142b4b6ac478793f29490aeeb855c3185e97332777 SHA512 7fdaad8fbd6d25ddba63695e78e8180ab708590f577902f007d807ab838a70dd59ceff539b9cb69d93f41e27e15784b3da265b592592835e1bbc60a9669c8b9d WHIRLPOOL e173995a1b2646c2adaa66f231637eed0d16ce00344fce8ba7fb24fa1f804198c77aa1799ff63347bb61c0777bc6504566a6c122c8ff997845d91e1fedde2612 -EBUILD zfs-kmod-0.6.2-r3.ebuild 3321 SHA256 c43d6939fb84cd00af17812d1ee1300d8e73719811c9863d5bbaad9fb7b0529c SHA512 bc568642dc62ec276a657730da4da79b8698849d1039e78dddc5b71769b5e333e96476e9925c013b751c9850db6fa81fb2be66bdeaac812336c9a55cd3437d4a WHIRLPOOL 69dd8e168d134031fdb2be3f35b146f74bcd8e440391c7e1e42b776245863f898de95c76fc985058cf01b556df925cabb924b6bcb8bf5e239c9b5d83351ce30f -EBUILD zfs-kmod-0.6.3-r1.ebuild 3792 SHA256 ad06fd9ccc7f5dcd4324b4e889bbb93829fb53fa1d407af9387f0940a213ed31 SHA512 3a49e413a010c47053932f78fae4b9e46fe8f641998a682404088d02d1afc53426055fb38ed907a9e115eaa17031a4c193c8e6a5370b44456c39d12ea171561d WHIRLPOOL 069c431319f19d493c5ef1e683b2a97184c038a0a5ea956062b2298176372a05b70fa7f840592d820852dbecbba6a3ee46428ef370845ebbb0dcf0d746f5742a -EBUILD zfs-kmod-0.6.4.2.ebuild 3989 SHA256 a0cfc07fdc639af190bab3ed7247f33fab70b654684a6b59bb0444713f83b3cb SHA512 4e1eec82ffa9243ef709ecef94ee47016b6c189951b057d25860f30bb33790d6d8f672956c1ed31d95470eb33b8222559181672f76e4ecf8670143e68d487185 WHIRLPOOL 6728e334b8b7e53da5d3c36280b604a3e74d6093d9e06311fa6e36493a7c5097795b1273b0de89c0f175ddc17a8dd9ccb1ff5f11fc0d123a3821a32e0700fe2e -EBUILD zfs-kmod-0.6.5-r1.ebuild 4282 SHA256 6fa7a2b8eb3b7838d060c8bba8f11db41a5113ff16435b75aa0bebabd46cc909 SHA512 fc5f4375db87185d15245a5e3859940d736a1af9fb90e07110bb257c270c1f14a19148e3185a47abc61617c104bfe37a07b692909ff9dbe8b4bd14938294da95 WHIRLPOOL c5b3cfa47d7fefefc2b29beb60e9377b9b9aca6baf0b4f72c7390ca3d02e967a9a055069543418faf4cd28562864a93a573f4230b6e50467d02c11df8683fd30 -EBUILD zfs-kmod-0.6.5.10.ebuild 4052 SHA256 ab375e8bdda895acc3ec1e115e8447a68bf4ec592489fb62ded1038662e9624b SHA512 773bb52b42462b69d5911e7f02a503872080f8c9c98c9a35959caaba65aa5cdf940f874f0b5058dd47548c6e3bc296b949ff37d46a4d9cdae177f289e83c1abd WHIRLPOOL 3a9686f6928d5709b3bfe236c5609cbda94990184e8d2b9cefca4cfe07cf42a39cfaf841e88b5f57fc0119cc2e672f9523a2460b203fcf5af3449f39c585e9a7 EBUILD zfs-kmod-0.6.5.11.ebuild 4052 SHA256 ab375e8bdda895acc3ec1e115e8447a68bf4ec592489fb62ded1038662e9624b SHA512 773bb52b42462b69d5911e7f02a503872080f8c9c98c9a35959caaba65aa5cdf940f874f0b5058dd47548c6e3bc296b949ff37d46a4d9cdae177f289e83c1abd WHIRLPOOL 3a9686f6928d5709b3bfe236c5609cbda94990184e8d2b9cefca4cfe07cf42a39cfaf841e88b5f57fc0119cc2e672f9523a2460b203fcf5af3449f39c585e9a7 -EBUILD zfs-kmod-0.6.5.2.ebuild 4096 SHA256 209a84d941532cb7cb66b1d2dce37c8e1481a37236d7573149940288e25a794a SHA512 7bf181388726e85cfbb8ab1d50645216c26ef3a2fd6390996ab28a14c982b7939293e50248c8b1c63108bf267e505b10ac764ea58b8a47deddb48a24e4b706c5 WHIRLPOOL 557992f25e44fc902d6ffbede7cf03f466c6e02d2cf39f547b96cf9a5dfdaf3448344c32a6474460c930ef50f4c541b0f4e7878d90d4773101ac98915f7d5e72 -EBUILD zfs-kmod-0.6.5.3-r4.ebuild 4377 SHA256 fb1cc449621181c8d3e7d5c3821f4313a07e7241b6da20ead7f0292b4c80ce60 SHA512 98e158c83c3068ad513830f801b56bad90712815e857aebd610fe1fbc2b33f869fa93b3d956ad08d57dcad352be5ee610e25fe0e1c61685d6f73551c002719c8 WHIRLPOOL 2d383aeb86b1ca585e8acecd7b427b13d247e01654ba9a0cd880a20c5a0726042a3b5b4ffaa94c1e89c26e2c0c1f65cdd4a3409436d2e5384b5ca1198418429e -EBUILD zfs-kmod-0.6.5.3.ebuild 4066 SHA256 c467680283e2c119ff12adbf4ecb2523d5e41353b66d878f70a2795dc0bb64aa SHA512 e5a4f2be284d93a49ac9c96bcd186f72f793a92975648f40ec1bf90c31e25e61c8e7e22a95fb63014c888d513c4942a850dc359ef647ad17811a802188cbb2fd WHIRLPOOL ac57ee877275b8560ef3283818e7f47748737b3315a6419916554deb941f3aaa246f84f024f41eff51667036f596e3a8e51a2afd49c9c9966b795681bdafe602 -EBUILD zfs-kmod-0.6.5.4-r1.ebuild 4383 SHA256 fba8daf4f77627e2449bf9b14216abb8e3daaf0c95c025dc957a0b1e7d60c4c0 SHA512 5271ddb239c2f7bf1923a6cca7a9de5c4eba3bbb71ce5554f58edd448cbc97372f25d51ca4cfb188fe1c3285648e09c057e09e0ba485adc68ff5305499ae8a5f WHIRLPOOL d00a7164eddc74f6981fc0f8e53fc018e26020b38a632dfdcb054abfbcf01bb9758bdc738ccf7dabd34dd32f4e494222b365dd3e048a6dcd2c760b34544ba7b0 -EBUILD zfs-kmod-0.6.5.4.ebuild 4050 SHA256 d4edbbd98248d2ea31d4c64c57990d45ca5c0db7dec01c9b090baec01a1f3fb7 SHA512 0afd38d6ec053ceb83ad97551267a211d8b09aef69161af2f52d7a30ea990eb2d47e98b1efd0d8e672abbe5543b49972c2b1fd06ad9f9b3f47f80070d739afb3 WHIRLPOOL 36fbc3615335902e20f2f32cfcd11c89ace959b3d928d1e991ed391d59f98f0d693c41e80acdd252bc5cf1f306ba3605554579e94cfe4c0f4d1ecc9d297dd29e -EBUILD zfs-kmod-0.6.5.6.ebuild 4050 SHA256 bfeac68656924c0a7afcf9e80a504e3a4f4431a2dcd5533ca1deca1cb07a7753 SHA512 3ef97c146c589a4390dfa5f9b7deb481bc393aac3321a7beecf85526425f5bba4a961fea1ed2d0b6692ea0120485581b19a1232730d30150646c0c0e4ca6925a WHIRLPOOL d7dc0dbde5baa6d5d91d59df8f4a6ed79c8605b3393c13a8fea27dcf4faeed4a046c313827ae7cc28ca0e2fd02c3fa55d6686e81a51e7bb5c764561feb255068 -EBUILD zfs-kmod-0.6.5.7.ebuild 4050 SHA256 bf73462ca8e0f3e42d0f84150d20c91dd0e1fed240d61858076192740c39ffb3 SHA512 fc5e5bdb35cc23127f17ed6ed360a7e7566ba47aeb13118ee0d1caf54c317462dc67f04f14f34e49ef7dc30a2811bcd01a27eea473f15a0b5d14359206e32997 WHIRLPOOL 19d7126cdcd0c69002bf2bdea9af9c0c650a3cb17e4bea26f74f7ce0254f4c6522ea66e3fab2611f62265dcf0155e069448f66c678a9421e50eaa8d2a1dc0f2f -EBUILD zfs-kmod-0.6.5.8.ebuild 4050 SHA256 fb1bcba00c52f50fb4704af297e646f5ea84179af367a72510f2d7da8bac2459 SHA512 9380de435663ace10ef5d8791afee4896f9768f82b5f34c7aa77bc0f79661f7bb6b22bf4c2639e88bf75c66f003a48b56df1d1310b816b7293e87d6e422b0bfe WHIRLPOOL 417e53f00754752fbc4f32051ce6d20bdae0ef9506c4382f538dfad71b0a34c7ca06014a6ae5272344792a9c0ad9998cc5bdfaecab1981b802ca21bb2ee81640 -EBUILD zfs-kmod-0.6.5.9.ebuild 4052 SHA256 91c9c8f8119422495913038bcc2a26c686dbb639ed035d53d9a65ae9397c6a6e SHA512 67ac053fd1f304710b800ac3482c6a54bf49f2f0f35ce49ea11a36338f051a8acbf24502c4a237b40705076da4275ebd080c59befb54e37b1877300425c89c9a WHIRLPOOL 41f14429fb2287928f86f69f3cf8a8fa95b235a8f0aefa39bef701d3a8dd038334d5094bc0c1cb67a670239d6d36536ab46afbc3e8952ab11e781a772bb9492c -EBUILD zfs-kmod-0.7.0.ebuild 4052 SHA256 ab375e8bdda895acc3ec1e115e8447a68bf4ec592489fb62ded1038662e9624b SHA512 773bb52b42462b69d5911e7f02a503872080f8c9c98c9a35959caaba65aa5cdf940f874f0b5058dd47548c6e3bc296b949ff37d46a4d9cdae177f289e83c1abd WHIRLPOOL 3a9686f6928d5709b3bfe236c5609cbda94990184e8d2b9cefca4cfe07cf42a39cfaf841e88b5f57fc0119cc2e672f9523a2460b203fcf5af3449f39c585e9a7 -EBUILD zfs-kmod-0.7.1.ebuild 4052 SHA256 ab375e8bdda895acc3ec1e115e8447a68bf4ec592489fb62ded1038662e9624b SHA512 773bb52b42462b69d5911e7f02a503872080f8c9c98c9a35959caaba65aa5cdf940f874f0b5058dd47548c6e3bc296b949ff37d46a4d9cdae177f289e83c1abd WHIRLPOOL 3a9686f6928d5709b3bfe236c5609cbda94990184e8d2b9cefca4cfe07cf42a39cfaf841e88b5f57fc0119cc2e672f9523a2460b203fcf5af3449f39c585e9a7 -EBUILD zfs-kmod-0.7.2.ebuild 4052 SHA256 8387e56d9e4a8d53f3fc48b1cb4183b6ac02bd6cd0db312b1aa3820944148a44 SHA512 cb81f3f2e1cb2a421f8d8adcba919f90057627353427d8b94cddf733eb7581f20a14822a305aa0ff8cf936d7abd7b9fc7a680aace3cb9214ebfaea6d5e4bccd2 WHIRLPOOL 0ca8da4a9dd623492a1f1c54320b482a06bf07dc1beb1d112966879896e429ce5748ed68724733490ea4db9ffbfe139a4ff1de8458dc656b29708be8c321d0eb +EBUILD zfs-kmod-0.6.5.4-r1.ebuild 4383 SHA256 edfeaff2337583933407f3b74d70f8f506a2baf366a2f2f1f11854a5d40e9a3b SHA512 185070373e51629e463764b277a51dddd43e254075523f96e3b6a108199927581ebec5d5eb1a1728450a131515d51c3f469dee40635832806334dc98e99fea91 WHIRLPOOL b034782f359e6197dd139e38794a2022f99e3d2063a12a4bc98edeecec8dd05dc95ee92e9a114b3c6596c45adda46a12d88fad585a6e3a6797741595e19996ee EBUILD zfs-kmod-0.7.3.ebuild 4052 SHA256 8387e56d9e4a8d53f3fc48b1cb4183b6ac02bd6cd0db312b1aa3820944148a44 SHA512 cb81f3f2e1cb2a421f8d8adcba919f90057627353427d8b94cddf733eb7581f20a14822a305aa0ff8cf936d7abd7b9fc7a680aace3cb9214ebfaea6d5e4bccd2 WHIRLPOOL 0ca8da4a9dd623492a1f1c54320b482a06bf07dc1beb1d112966879896e429ce5748ed68724733490ea4db9ffbfe139a4ff1de8458dc656b29708be8c321d0eb EBUILD zfs-kmod-9999.ebuild 4068 SHA256 47457fd311c6a3f2c2d66206e39bc041ba1ef1979e41fa942d82603562dfb66e SHA512 2e421316f3bcad2cf939b3930a8a8e65f37682063737259ff19a4cc76fc3cb2d23845e24b1b8c23accdbfea1f1168c94b37759bd181a9302a0a723c537d84a60 WHIRLPOOL bf51feaab6634d27d5365747c2ca434717426b3d843725eedd89d60e3c408c63197cd5da23419077f69c62fd692306de6fc798883ae3b5d902292ff3cda0cb23 MISC ChangeLog 12130 SHA256 3801bf091ee95d43a08aa11b014919287cb8071903b0dc75e482ad7418d6a0b1 SHA512 206dd30070d2f19e6c05fe4a122159916c597a60d28cf3c5f70e58394f613918986bbb0212884428ff7033a08b420556303ba1b53648d08e4218b02403a7b89a WHIRLPOOL 5eda564e5080101491e00362dec85baba0f09b5d948045151645de20e770d48940b13d019c42c5cd342d684c8174d66ac6c0de3d5365b713972548fc4411c003 diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch deleted file mode 100644 index 2daf211c7744..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1c50c992bafd96773dc3950d382a89806df8cc9c Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Wed, 9 Jan 2013 11:09:06 -0800 -Subject: [PATCH] Revert "Avoid ELOOP on auto-mounted snapshots" - -This reverts commit 7afcf5b1da83549bfba70a61fae7a00eaa63c2b0 which -accidentally introduced a regression with the .zfs snapshot directory. -While the updated code still does correctly mount the requested -snapshot. It updates the vfsmount such that it references the -original dataset vfsmount. The result is that the snapshot itself -isn't visible. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Issue #816 ---- - module/zfs/zpl_ctldir.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/module/zfs/zpl_ctldir.c b/module/zfs/zpl_ctldir.c -index a2d8fa9..7dfaf6e 100644 ---- a/module/zfs/zpl_ctldir.c -+++ b/module/zfs/zpl_ctldir.c -@@ -357,13 +357,6 @@ - return ERR_PTR(error); - - /* -- * Ensure path->dentry points to the dentry for the root of the -- * newly-mounted snapshot, otherwise this function may be called -- * repeatedly which can lead to an incorrect ELOOP error return. -- */ -- follow_up(path); -- -- /* - * Rather than returning the new vfsmount for the snapshot we must - * return NULL to indicate a mount collision. This is done because - * the user space mount calls do_add_mount() which adds the vfsmount --- -1.7.10 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch deleted file mode 100644 index 7d0263f31901..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c -index 21fdd08..872d44a 100644 ---- a/module/zfs/dsl_dataset.c -+++ b/module/zfs/dsl_dataset.c -@@ -20,7 +20,7 @@ - */ - /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -- * Copyright (c) 2011 by Delphix. All rights reserved. -+ * Copyright (c) 2012 by Delphix. All rights reserved. - * Copyright (c) 2012, Joyent, Inc. All rights reserved. - */ - -@@ -4158,9 +4220,13 @@ struct dsl_ds_releasearg { - dsl_dataset_t *snap; - uint64_t used, comp, uncomp; - -- err = dsl_dataset_hold_obj(dp, snapobj, FTAG, &snap); -- if (err != 0) -- break; -+ if (snapobj == new->ds_object) { -+ snap = new; -+ } else { -+ err = dsl_dataset_hold_obj(dp, snapobj, FTAG, &snap); -+ if (err != 0) -+ break; -+ } - - if (snap->ds_phys->ds_prev_snap_txg == - oldsnap->ds_phys->ds_creation_txg) { -@@ -4189,7 +4255,8 @@ struct dsl_ds_releasearg { - * was not a snapshot of/before new. - */ - snapobj = snap->ds_phys->ds_prev_snap_obj; -- dsl_dataset_rele(snap, FTAG); -+ if (snap != new) -+ dsl_dataset_rele(snap, FTAG); - if (snapobj == 0) { - err = EINVAL; - break; diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-gcc-4.7-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-gcc-4.7-compat.patch deleted file mode 100644 index 9f31ecc82307..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-gcc-4.7-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 37f000c5aa76613e644cf3e5b1ec7bd2df6f7451 Mon Sep 17 00:00:00 2001 -From: Ned Bass <bass6@llnl.gov> -Date: Wed, 26 Dec 2012 14:56:41 -0800 -Subject: [PATCH] Fix gcc array subscript above bounds warning - -In a debug build, certain GCC versions flag an array bounds warning in -the below code from dnode_sync.c - - } else { - int i; - ASSERT(dn->dn_next_nblkptr[txgoff] < dnp->dn_nblkptr); - /* the blkptrs we are losing better be unallocated */ - for (i = dn->dn_next_nblkptr[txgoff]; - i < dnp->dn_nblkptr; i++) - ASSERT(BP_IS_HOLE(&dnp->dn_blkptr[i])); - -This usage is in fact safe, since the ASSERT ensures the index does -not exceed to maximum possible number of block pointers. However gcc -can't determine that the assignment 'i = dn->dn_next_nblkptr[txgoff];' -falls within the array bounds so it issues a warning. To avoid this, -initialize i to zero to make gcc happy but skip the elements before -dn->dn_next_nblkptr[txgoff] in the loop body. Since a dnode contains -at most 3 block pointers this overhead should be negligible. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #950 ---- - module/zfs/dnode_sync.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/module/zfs/dnode_sync.c b/module/zfs/dnode_sync.c -index af636dc..f2dda86 100644 ---- a/module/zfs/dnode_sync.c -+++ b/module/zfs/dnode_sync.c -@@ -666,9 +666,10 @@ - int i; - ASSERT(dn->dn_next_nblkptr[txgoff] < dnp->dn_nblkptr); - /* the blkptrs we are losing better be unallocated */ -- for (i = dn->dn_next_nblkptr[txgoff]; -- i < dnp->dn_nblkptr; i++) -- ASSERT(BP_IS_HOLE(&dnp->dn_blkptr[i])); -+ for (i = 0; i < dnp->dn_nblkptr; i++) { -+ if (i >= dn->dn_next_nblkptr[txgoff]) -+ ASSERT(BP_IS_HOLE(&dnp->dn_blkptr[i])); -+ } - #endif - } - mutex_enter(&dn->dn_mtx); --- -1.7.10 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch deleted file mode 100644 index 13189244c69a..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dd26aa535b395735ca61ea2a3e618aded45eb05e Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Mon, 4 Feb 2013 16:35:54 -0800 -Subject: [PATCH] Cast 'zfs bad bloc' to ULL for x86 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Explicitly case this value to an unsigned long long for 32-bit -systems to inform the compiler that a long type should not be -used. Otherwise we get the following compiler error: - - dmu_send.c:376: error: integer constant is too large for - ‘long’ type - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> ---- - module/zfs/dmu_send.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c -index 0cf3c4a..921c3d7 100644 ---- a/module/zfs/dmu_send.c -+++ b/module/zfs/dmu_send.c -@@ -373,7 +373,7 @@ - for (ptr = abuf->b_data; - (char *)ptr < (char *)abuf->b_data + blksz; - ptr++) -- *ptr = 0x2f5baddb10c; -+ *ptr = 0x2f5baddb10cULL; - } else { - return (EIO); - } --- -1.7.10 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch deleted file mode 100644 index fb4c7c35696c..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/config/kernel.m4 b/config/kernel.m4 -index 5623785..9d5aa46 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -16,7 +16,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ - ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS - ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE - ZFS_AC_KERNEL_BDEV_PHYSICAL_BLOCK_SIZE -- ZFS_AC_KERNEL_BIO_EMPTY_BARRIER - ZFS_AC_KERNEL_BIO_FAILFAST - ZFS_AC_KERNEL_BIO_FAILFAST_DTD - ZFS_AC_KERNEL_REQ_FAILFAST_MASK -diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c -index cbf0a4d..e902a70 100644 ---- a/module/zfs/vdev_disk.c -+++ b/module/zfs/vdev_disk.c -@@ -604,8 +604,6 @@ - return __vdev_disk_physio(bdev, NULL, kbuf, size, offset, flags); - } - --/* 2.6.24 API change */ --#ifdef HAVE_BIO_EMPTY_BARRIER - BIO_END_IO_PROTO(vdev_disk_io_flush_completion, bio, size, rc) - { - zio_t *zio = bio->bi_private; -@@ -646,13 +644,6 @@ - - return 0; - } --#else --static int --vdev_disk_io_flush(struct block_device *bdev, zio_t *zio) --{ -- return ENOTSUP; --} --#endif /* HAVE_BIO_EMPTY_BARRIER */ - - static int - vdev_disk_io_start(zio_t *zio) --- -1.7.10 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch deleted file mode 100644 index 15d5af34d5c5..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch +++ /dev/null @@ -1,105 +0,0 @@ -From d75af3c0ebb4e31ece087aeecfeff282cb6f1361 Mon Sep 17 00:00:00 2001 -From: Etienne Dechamps <etienne@edechamps.fr> -Date: Sun, 24 Feb 2013 12:42:28 +0000 -Subject: [PATCH] Use -Werror for all kernel configure tests. - -As a matter of fact, we're already using -Werror for most tests because -of a bug in kernel-bio-empty-barrier.m4 which sets -Werror without -reverting it afterwards. This meant that all tests which ran after this -one was using -Werror. - -This patch simply makes it clear that we're using -Werror and makes -the code more readable and more predictable. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1317 ---- - config/kernel-bio-empty-barrier.m4 | 1 - - config/kernel-bio-end-io-t-args.m4 | 3 --- - config/kernel-security-inode-init.m4 | 6 ------ - config/kernel.m4 | 2 +- - 4 files changed, 1 insertion(+), 11 deletions(-) - -diff --git a/config/kernel-bio-empty-barrier.m4 b/config/kernel-bio-empty-barrier.m4 -index 99549fe..fda16b3 100644 ---- a/config/kernel-bio-empty-barrier.m4 -+++ b/config/kernel-bio-empty-barrier.m4 -@@ -4,7 +4,6 @@ dnl # Empty write barriers are now supported and we should use them. - dnl # - AC_DEFUN([ZFS_AC_KERNEL_BIO_EMPTY_BARRIER], [ - AC_MSG_CHECKING([whether bio_empty_barrier() is defined]) -- EXTRA_KCFLAGS="-Werror" - ZFS_LINUX_TRY_COMPILE([ - #include <linux/bio.h> - ],[ -diff --git a/config/kernel-bio-end-io-t-args.m4 b/config/kernel-bio-end-io-t-args.m4 -index ced4861..44e4826 100644 ---- a/config/kernel-bio-end-io-t-args.m4 -+++ b/config/kernel-bio-end-io-t-args.m4 -@@ -9,8 +9,6 @@ dnl # to void. - dnl # - AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [ - AC_MSG_CHECKING([whether bio_end_io_t wants 2 args]) -- tmp_flags="$EXTRA_KCFLAGS" -- EXTRA_KCFLAGS="-Werror" - ZFS_LINUX_TRY_COMPILE([ - #include <linux/bio.h> - ],[ -@@ -25,5 +23,4 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [ - ],[ - AC_MSG_RESULT(no) - ]) -- EXTRA_KCFLAGS="$tmp_flags" - ]) -diff --git a/config/kernel-security-inode-init.m4 b/config/kernel-security-inode-init.m4 -index c21588a..a62176d 100644 ---- a/config/kernel-security-inode-init.m4 -+++ b/config/kernel-security-inode-init.m4 -@@ -7,8 +7,6 @@ dnl # security checks will just be skipped. - dnl # - AC_DEFUN([ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY], [ - AC_MSG_CHECKING([whether security_inode_init_security wants 6 args]) -- tmp_flags="$EXTRA_KCFLAGS" -- EXTRA_KCFLAGS="-Werror" - ZFS_LINUX_TRY_COMPILE([ - #include <linux/security.h> - ],[ -@@ -27,7 +25,6 @@ AC_DEFUN([ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY], [ - ],[ - AC_MSG_RESULT(no) - ]) -- EXTRA_KCFLAGS="$tmp_flags" - ]) - - dnl # -@@ -39,8 +36,6 @@ dnl # and the EVM xattr. - dnl # - AC_DEFUN([ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY], [ - AC_MSG_CHECKING([whether security_inode_init_security wants callback]) -- tmp_flags="$EXTRA_KCFLAGS" -- EXTRA_KCFLAGS="-Werror" - ZFS_LINUX_TRY_COMPILE([ - #include <linux/security.h> - ],[ -@@ -57,5 +52,4 @@ AC_DEFUN([ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY], [ - ],[ - AC_MSG_RESULT(no) - ]) -- EXTRA_KCFLAGS="$tmp_flags" - ]) -diff --git a/config/kernel.m4 b/config/kernel.m4 -index 6d28074..5623785 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -488,7 +488,7 @@ AC_DEFUN([ZFS_LINUX_COMPILE_IFELSE], [ - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - AS_IF( -- [AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])], -+ [AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])], - [$4], - [_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])] - ) --- -1.7.10 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-hardened-support.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-hardened-support.patch deleted file mode 100644 index 03ee65ef9d4a..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-hardened-support.patch +++ /dev/null @@ -1,473 +0,0 @@ -From ead579050140bfa010d06f6e0fea3f680c781b38 Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@cs.stonybrook.edu> -Date: Thu, 14 Feb 2013 18:54:04 -0500 -Subject: [PATCH] Eliminate runtime function pointer modifications in - autotools checks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -PaX/GrSecurity patched kernels implement a dialect of C that relies on a -GCC plugin for enforcement. A basic idea in this dialect is that -function pointers in structures should not change during runtime. -This causes code that modifies function pointers at runtime to fail to -compile in many instances. The autotools checks rely on whether or -not small test cases compile against a given kernel. Some -autotools checks assume some default case if other cases fail. When one -of these autotools checks tests a PaX/GrSecurity patched kernel by -modifying a function pointer at runtime, the default case will be used. - -Early detection of such situations is possible by relying on compiler -warnings, which are compiler errors when --enable-debug is used. -Unfortunately, very few people build ZFS with --enable-debug. The more -common situation is that these issues manifest themselves as runtime -failures in the form of NULL pointer exceptions. - -Previous patches that addressed such issues with PaX/GrSecurity -compatibility largely relied on rewriting autotools checks to avoid -runtime function pointer modification or the addition of PaX/GrSecurity -specific checks. This patch takes the previous work to its logical -conclusion by eliminating the use of runtime function pointer -modification. This permits the removal of PaX-specific autotools checks -in favor of ones that work across all supported kernels. - -This should resolve issues that were reported to occur with -PaX/GrSecurity-patched Linux 3.7.5 kernels on Gentoo Linux. - -https://bugs.gentoo.org/show_bug.cgi?id=457176 - -We should be able to prevent future regressions in PaX/GrSecurity -compatibility by ensuring that all changes to ZFSOnLinux avoid runtime -function pointer modification. At the same time, this does not solve the -issue of silent failures triggering default cases in the autotools -check, which is what permitted these regressions to become runtime -failures in the first place. This will need to be addressed in a future -patch. - -Reported-by: Marcin Mirosław <bug@mejor.pl> -Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu> ---- - config/kernel-bdev-block-device-operations.m4 | 21 +++---- - config/kernel-bio-end-io-t-args.m4 | 6 +- - config/kernel-create-nameidata.m4 | 12 ++-- - config/kernel-dentry-operations.m4 | 6 +- - config/kernel-dirty-inode.m4 | 8 +-- - config/kernel-fallocate.m4 | 37 +++-------- - config/kernel-fsync.m4 | 84 ++++--------------------- - config/kernel-lookup-nameidata.m4 | 9 +-- - config/kernel-mkdir-umode-t.m4 | 7 ++- - config/kernel-shrink.m4 | 21 +++---- - 10 files changed, 62 insertions(+), 149 deletions(-) - -diff --git a/config/kernel-bdev-block-device-operations.m4 b/config/kernel-bdev-block-device-operations.m4 -index 28c3032..1674af0 100644 ---- a/config/kernel-bdev-block-device-operations.m4 -+++ b/config/kernel-bdev-block-device-operations.m4 -@@ -7,24 +7,21 @@ AC_DEFUN([ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS], [ - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" - ZFS_LINUX_TRY_COMPILE([ - #include <linux/blkdev.h> -- ],[ -- int (*blk_open) (struct block_device *, fmode_t) = NULL; -- int (*blk_release) (struct gendisk *, fmode_t) = NULL; -- int (*blk_ioctl) (struct block_device *, fmode_t, -- unsigned, unsigned long) = NULL; -- int (*blk_compat_ioctl) (struct block_device *, fmode_t, -- unsigned, unsigned long) = NULL; -- struct block_device_operations blk_ops = { -+ -+ int blk_open (struct block_device *bdev, fmode_t mode) { return 0; } -+ int blk_release (struct gendisk *g, fmode_t mode) { return 0; } -+ int blk_ioctl (struct block_device *bdev, fmode_t mode, -+ unsigned x, unsigned long y) { return 0; } -+ int blk_compat_ioctl (struct block_device * bdev, fmode_t mode, -+ unsigned x, unsigned long y) { return 0; } -+ static struct block_device_operations blk_ops __attribute__ ((unused)) = { - .open = blk_open, - .release = blk_release, - .ioctl = blk_ioctl, - .compat_ioctl = blk_compat_ioctl, - }; -+ ],[ - -- blk_ops.open(NULL, 0); -- blk_ops.release(NULL, 0); -- blk_ops.ioctl(NULL, 0, 0, 0); -- blk_ops.compat_ioctl(NULL, 0, 0, 0); - ],[ - AC_MSG_RESULT(struct block_device) - AC_DEFINE(HAVE_BDEV_BLOCK_DEVICE_OPERATIONS, 1, -diff --git a/config/kernel-bio-end-io-t-args.m4 b/config/kernel-bio-end-io-t-args.m4 -index ced4861..fe5707a 100644 ---- a/config/kernel-bio-end-io-t-args.m4 -+++ b/config/kernel-bio-end-io-t-args.m4 -@@ -13,11 +13,9 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [ - EXTRA_KCFLAGS="-Werror" - ZFS_LINUX_TRY_COMPILE([ - #include <linux/bio.h> -+ void wanted_end_io(struct bio * bio, int x) { return; } - ],[ -- void (*wanted_end_io)(struct bio *, int) = NULL; -- bio_end_io_t *local_end_io __attribute__ ((unused)); -- -- local_end_io = wanted_end_io; -+ bio_end_io_t *local_end_io __attribute__ ((unused)) = wanted_end_io; - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_2ARGS_BIO_END_IO_T, 1, -diff --git a/config/kernel-create-nameidata.m4 b/config/kernel-create-nameidata.m4 -index 100f077..c779715 100644 ---- a/config/kernel-create-nameidata.m4 -+++ b/config/kernel-create-nameidata.m4 -@@ -5,18 +5,18 @@ AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [ - AC_MSG_CHECKING([whether iops->create() takes struct nameidata]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -- ],[ - #ifdef HAVE_MKDIR_UMODE_T -- int (*inode_create) (struct inode *,struct dentry *, -- umode_t, struct nameidata *) = NULL; -+ int inode_create (struct inode *inode ,struct dentry *dentry, -+ umode_t umode, struct nameidata *nidata) { return 0; } - #else -- int (*inode_create) (struct inode *,struct dentry *, -- int, struct nameidata *) = NULL; -+ int inode_create (struct inode *inode,struct dentry *dentry, -+ int umode, struct nameidata * nidata) { return 0; } - #endif -- struct inode_operations iops __attribute__ ((unused)) = { -+ static struct inode_operations iops __attribute__ ((unused)) = { - .create = inode_create, - }; - ],[ -+ ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_CREATE_NAMEIDATA, 1, - [iops->create() operation takes nameidata]) -diff --git a/config/kernel-dentry-operations.m4 b/config/kernel-dentry-operations.m4 -index dfbea7d..b89c51d 100644 ---- a/config/kernel-dentry-operations.m4 -+++ b/config/kernel-dentry-operations.m4 -@@ -5,12 +5,12 @@ AC_DEFUN([ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA], [ - AC_MSG_CHECKING([whether dops->d_revalidate() takes struct nameidata]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/dcache.h> -- ],[ -- int (*revalidate) (struct dentry *, struct nameidata *) = NULL; -- struct dentry_operations dops __attribute__ ((unused)) = { -+ int revalidate (struct dentry *dentry, struct nameidata *nidata) { return 0; } -+ static struct dentry_operations dops __attribute__ ((unused)) = { - .d_revalidate = revalidate, - }; - ],[ -+ ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_D_REVALIDATE_NAMEIDATA, 1, - [dops->d_revalidate() operation takes nameidata]) -diff --git a/config/kernel-dirty-inode.m4 b/config/kernel-dirty-inode.m4 -index 2ededf1..86e3425 100644 ---- a/config/kernel-dirty-inode.m4 -+++ b/config/kernel-dirty-inode.m4 -@@ -8,11 +8,11 @@ AC_DEFUN([ZFS_AC_KERNEL_DIRTY_INODE_WITH_FLAGS], [ - AC_MSG_CHECKING([whether sops->dirty_inode() wants flags]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -+ void dirty_inode (struct inode * a, int b) { return; } -+ static struct super_operations sops __attribute__ ((unused)) = { -+ .dirty_inode = dirty_inode, -+ }; - ],[ -- void (*dirty_inode) (struct inode *, int) = NULL; -- struct super_operations sops __attribute__ ((unused)); -- -- sops.dirty_inode = dirty_inode; - ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_DIRTY_INODE_WITH_FLAGS, 1, -diff --git a/config/kernel-fallocate.m4 b/config/kernel-fallocate.m4 -index 6ac5ae6..0041ef2 100644 ---- a/config/kernel-fallocate.m4 -+++ b/config/kernel-fallocate.m4 -@@ -5,12 +5,12 @@ AC_DEFUN([ZFS_AC_KERNEL_FILE_FALLOCATE], [ - AC_MSG_CHECKING([whether fops->fallocate() exists]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -- ],[ -- long (*fallocate) (struct file *, int, loff_t, loff_t) = NULL; -- struct file_operations fops __attribute__ ((unused)) = { -- .fallocate = fallocate, -+ long test_fallocate(struct file *file, int mode, loff_t offset, loff_t len) { return 0; } -+ static const struct file_operations fops __attribute__ ((unused)) = { -+ .fallocate = test_fallocate, - }; - ],[ -+ ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists]) - ],[ -@@ -25,34 +25,14 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_FALLOCATE], [ - AC_MSG_CHECKING([whether iops->fallocate() exists]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -- ],[ -- long (*fallocate) (struct inode *, int, loff_t, loff_t) = NULL; -- struct inode_operations fops __attribute__ ((unused)) = { -- .fallocate = fallocate, -+ long test_fallocate (struct inode *inode, int mode, loff_t offset, loff_t len) { return 0; } -+ static const struct inode_operations fops __attribute__ ((unused)) = { -+ .fallocate = test_fallocate, - }; - ],[ -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_INODE_FALLOCATE, 1, [fops->fallocate() exists]) -- ],[ -- AC_MSG_RESULT(no) -- ]) --]) -- --dnl # --dnl # PaX Linux 2.6.38 - 3.x API --dnl # --AC_DEFUN([ZFS_AC_PAX_KERNEL_FILE_FALLOCATE], [ -- AC_MSG_CHECKING([whether fops->fallocate() exists]) -- ZFS_LINUX_TRY_COMPILE([ -- #include <linux/fs.h> -- ],[ -- long (*fallocate) (struct file *, int, loff_t, loff_t) = NULL; -- struct file_operations_no_const fops __attribute__ ((unused)) = { -- .fallocate = fallocate, -- }; - ],[ - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists]) -+ AC_DEFINE(HAVE_INODE_FALLOCATE, 1, [fops->fallocate() exists]) - ],[ - AC_MSG_RESULT(no) - ]) -@@ -65,5 +45,4 @@ dnl # - AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [ - ZFS_AC_KERNEL_FILE_FALLOCATE - ZFS_AC_KERNEL_INODE_FALLOCATE -- ZFS_AC_PAX_KERNEL_FILE_FALLOCATE - ]) -diff --git a/config/kernel-fsync.m4 b/config/kernel-fsync.m4 -index ca00d93..9ac0c79 100644 ---- a/config/kernel-fsync.m4 -+++ b/config/kernel-fsync.m4 -@@ -4,11 +4,11 @@ dnl # - AC_DEFUN([ZFS_AC_KERNEL_FSYNC_WITH_DENTRY], [ - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -+ int test_fsync (struct file *f, struct dentry *dentry, int x) { return 0; } -+ static const struct file_operations fops __attribute__ ((unused)) = { -+ .fsync = test_fsync, -+ }; - ],[ -- int (*fsync) (struct file *, struct dentry *, int) = NULL; -- struct file_operations fops __attribute__ ((unused)); -- -- fops.fsync = fsync; - ],[ - AC_MSG_RESULT([dentry]) - AC_DEFINE(HAVE_FSYNC_WITH_DENTRY, 1, -@@ -23,11 +23,11 @@ dnl # - AC_DEFUN([ZFS_AC_KERNEL_FSYNC_WITHOUT_DENTRY], [ - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -+ int test_fsync (struct file *f, int x) { return 0; } -+ static const struct file_operations fops __attribute__ ((unused)) = { -+ .fsync = test_fsync, -+ }; - ],[ -- int (*fsync) (struct file *, int) = NULL; -- struct file_operations fops __attribute__ ((unused)); -- -- fops.fsync = fsync; - ],[ - AC_MSG_RESULT([no dentry]) - AC_DEFINE(HAVE_FSYNC_WITHOUT_DENTRY, 1, -@@ -42,68 +42,11 @@ dnl # - AC_DEFUN([ZFS_AC_KERNEL_FSYNC_RANGE], [ - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -+ int test_fsync (struct file *f, loff_t a, loff_t b, int c) { return 0; } -+ static const struct file_operations fops __attribute__ ((unused)) = { -+ .fsync = test_fsync, -+ }; - ],[ -- int (*fsync) (struct file *, loff_t, loff_t, int) = NULL; -- struct file_operations fops __attribute__ ((unused)); -- -- fops.fsync = fsync; -- ],[ -- AC_MSG_RESULT([range]) -- AC_DEFINE(HAVE_FSYNC_RANGE, 1, -- [fops->fsync() with range]) -- ],[ -- ]) --]) -- --dnl # --dnl # PaX Linux 2.6.x - 2.6.34 API --dnl # --AC_DEFUN([ZFS_AC_PAX_KERNEL_FSYNC_WITH_DENTRY], [ -- ZFS_LINUX_TRY_COMPILE([ -- #include <linux/fs.h> -- ],[ -- int (*fsync) (struct file *, struct dentry *, int) = NULL; -- file_operations_no_const fops __attribute__ ((unused)); -- -- fops.fsync = fsync; -- ],[ -- AC_MSG_RESULT([dentry]) -- AC_DEFINE(HAVE_FSYNC_WITH_DENTRY, 1, -- [fops->fsync() with dentry]) -- ],[ -- ]) --]) -- --dnl # --dnl # PaX Linux 2.6.35 - Linux 3.0 API --dnl # --AC_DEFUN([ZFS_AC_PAX_KERNEL_FSYNC_WITHOUT_DENTRY], [ -- ZFS_LINUX_TRY_COMPILE([ -- #include <linux/fs.h> -- ],[ -- int (*fsync) (struct file *, int) = NULL; -- file_operations_no_const fops __attribute__ ((unused)); -- -- fops.fsync = fsync; -- ],[ -- AC_MSG_RESULT([no dentry]) -- AC_DEFINE(HAVE_FSYNC_WITHOUT_DENTRY, 1, -- [fops->fsync() without dentry]) -- ],[ -- ]) --]) -- --dnl # --dnl # PaX Linux 3.1 - 3.x API --dnl # --AC_DEFUN([ZFS_AC_PAX_KERNEL_FSYNC_RANGE], [ -- ZFS_LINUX_TRY_COMPILE([ -- #include <linux/fs.h> -- ],[ -- int (*fsync) (struct file *, loff_t, loff_t, int) = NULL; -- file_operations_no_const fops __attribute__ ((unused)); -- -- fops.fsync = fsync; - ],[ - AC_MSG_RESULT([range]) - AC_DEFINE(HAVE_FSYNC_RANGE, 1, -@@ -117,7 +60,4 @@ AC_DEFUN([ZFS_AC_KERNEL_FSYNC], [ - ZFS_AC_KERNEL_FSYNC_WITH_DENTRY - ZFS_AC_KERNEL_FSYNC_WITHOUT_DENTRY - ZFS_AC_KERNEL_FSYNC_RANGE -- ZFS_AC_PAX_KERNEL_FSYNC_WITH_DENTRY -- ZFS_AC_PAX_KERNEL_FSYNC_WITHOUT_DENTRY -- ZFS_AC_PAX_KERNEL_FSYNC_RANGE - ]) -diff --git a/config/kernel-lookup-nameidata.m4 b/config/kernel-lookup-nameidata.m4 -index 5e30be4..20b8cca 100644 ---- a/config/kernel-lookup-nameidata.m4 -+++ b/config/kernel-lookup-nameidata.m4 -@@ -5,13 +5,14 @@ AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [ - AC_MSG_CHECKING([whether iops->lookup() takes struct nameidata]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -- ],[ -- struct dentry * (*inode_lookup) (struct inode *,struct dentry *, -- struct nameidata *) = NULL; -- struct inode_operations iops __attribute__ ((unused)) = { -+ struct dentry * inode_lookup (struct inode * inode, -+ struct dentry * dentry, struct nameidata * nidata) -+ { return NULL; } -+ static struct inode_operations iops __attribute__ ((unused)) = { - .lookup = inode_lookup, - }; - ],[ -+ ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LOOKUP_NAMEIDATA, 1, - [iops->lookup() operation takes nameidata]) -diff --git a/config/kernel-mkdir-umode-t.m4 b/config/kernel-mkdir-umode-t.m4 -index dd5d94b..ce8aa8f 100644 ---- a/config/kernel-mkdir-umode-t.m4 -+++ b/config/kernel-mkdir-umode-t.m4 -@@ -10,12 +10,13 @@ AC_DEFUN([ZFS_AC_KERNEL_MKDIR_UMODE_T], [ - AC_MSG_CHECKING([whether iops->create()/mkdir()/mknod() take umode_t]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -- ],[ -- int (*mkdir) (struct inode *,struct dentry *,umode_t) = NULL; -- struct inode_operations iops __attribute__ ((unused)) = { -+ int mkdir (struct inode * inode, struct dentry * dentry, umode_t umode) -+ { return 0; } -+ static struct inode_operations iops __attribute__ ((unused)) = { - .mkdir = mkdir, - }; - ],[ -+ ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MKDIR_UMODE_T, 1, - [iops->create()/mkdir()/mknod() take umode_t]) -diff --git a/config/kernel-shrink.m4 b/config/kernel-shrink.m4 -index ea748c9..ce4b965 100644 ---- a/config/kernel-shrink.m4 -+++ b/config/kernel-shrink.m4 -@@ -8,15 +8,14 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINK], [ - AC_MSG_CHECKING([whether super_block has s_shrink]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -- ],[ -- int (*shrink)(struct shrinker *, struct shrink_control *sc) -- __attribute__ ((unused)) = NULL; -- struct super_block sb __attribute__ ((unused)) = { -+ int shrink(struct shrinker * s, struct shrink_control *sc) { return 0; } -+ static struct super_block sb __attribute__ ((unused)) = { - .s_shrink.shrink = shrink, - .s_shrink.seeks = DEFAULT_SEEKS, - .s_shrink.batch = 0, - }; - ],[ -+ ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SHRINK, 1, [struct super_block has s_shrink]) - -@@ -29,13 +28,12 @@ AC_DEFUN([ZFS_AC_KERNEL_NR_CACHED_OBJECTS], [ - AC_MSG_CHECKING([whether sops->nr_cached_objects() exists]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -- ],[ -- int (*nr_cached_objects)(struct super_block *) -- __attribute__ ((unused)) = NULL; -- struct super_operations sops __attribute__ ((unused)) = { -+ int nr_cached_objects(struct super_block * sb) { return 0; } -+ static struct super_operations sops __attribute__ ((unused)) = { - .nr_cached_objects = nr_cached_objects, - }; - ],[ -+ ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NR_CACHED_OBJECTS, 1, - [sops->nr_cached_objects() exists]) -@@ -48,13 +46,12 @@ AC_DEFUN([ZFS_AC_KERNEL_FREE_CACHED_OBJECTS], [ - AC_MSG_CHECKING([whether sops->free_cached_objects() exists]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/fs.h> -- ],[ -- void (*free_cached_objects)(struct super_block *, int) -- __attribute__ ((unused)) = NULL; -- struct super_operations sops __attribute__ ((unused)) = { -+ void free_cached_objects(struct super_block * sb, int x) { return; } -+ static struct super_operations sops __attribute__ ((unused)) = { - .free_cached_objects = free_cached_objects, - }; - ],[ -+ ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_FREE_CACHED_OBJECTS, 1, - [sops->free_cached_objects() exists]) --- -1.7.10 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch deleted file mode 100644 index 1dfef6117f1a..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 3d8c9c9de0a5e1f1b496fcef2750a01a45860b04 -Author: Richard Yao <ryao@cs.stonybrook.edu> -Date: Mon Mar 4 15:52:11 2013 -0500 - - Linux 3.9 compat: Undefine GCC_VERSION - - The mainline kernel started defining GCC_VERSION with commit - torvalds/linux@3f3f8d2f48acfd8ed3b8e6b7377935da57b27b16. Unfortunately, - LZ4 also defines this macro, but the two defintions are incompatible. We - undefine GCC_VERSION in lz4.c to handle this. - - Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu> - -diff --git a/module/zfs/lz4.c b/module/zfs/lz4.c -index b9850c0..8afaad1 100644 ---- a/module/zfs/lz4.c -+++ b/module/zfs/lz4.c -@@ -243,6 +243,14 @@ lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n) - /* Disable restrict */ - #define restrict - -+/* -+ * Linux : GCC_VERSION is defined as of 3.9-rc1, so undefine it. -+ * torvalds/linux@3f3f8d2f48acfd8ed3b8e6b7377935da57b27b16 -+ */ -+#ifdef GCC_VERSION -+#undef GCC_VERSION -+#endif -+ - #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) - - #if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
\ No newline at end of file diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch deleted file mode 100644 index 5f9f6525e73c..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7f235381a0e501df55ebe2de10b69124e928d175 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Mon, 11 Feb 2013 12:55:24 -0800 -Subject: [PATCH] Add explicit MAXNAMELEN check - -It turns out that the Linux VFS doesn't strictly handle all cases -where a component path name exceeds MAXNAMELEN. It does however -appear to correctly handle MAXPATHLEN for us. - -The right way to handle this appears to be to add an explicit -check to the zpl_lookup() function. Several in-tree filesystems -handle this case the same way. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Issue #1279 ---- - module/zfs/zpl_inode.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c -index e406288..8c8ec24 100644 ---- a/module/zfs/zpl_inode.c -+++ b/module/zfs/zpl_inode.c -@@ -41,6 +41,9 @@ - struct inode *ip; - int error; - -+ if (dlen(dentry) > ZFS_MAXNAMELEN) -+ return ERR_PTR(-ENAMETOOLONG); -+ - crhold(cr); - error = -zfs_lookup(dir, dname(dentry), &ip, 0, cr, NULL, NULL); - ASSERT3S(error, <=, 0); --- -1.7.10 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-zfs_arc_memory_throttle_disable.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-zfs_arc_memory_throttle_disable.patch deleted file mode 100644 index 81ec15f3e6c7..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-zfs_arc_memory_throttle_disable.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 546c978bbd3f132a88609cab15ec0e954eaa62b8 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Thu, 21 Feb 2013 12:14:44 -0800 -Subject: [PATCH] Enable zfs_arc_memory_throttle_disable by default - -The zfs_arc_memory_throttle_disable module option was introduced -by commit 0c5493d47059f25ce9dbf20c9fe87655f55102a1 to resolve a -memory miscalculation which could result in the txg_sync thread -spinning. - -When this was first introduced the default behavior was left -unchanged until enough real world usage confirmed there were no -unexpected issues. We've now reached that point. Linux's -direct reclaim is working as expected so we're enabling this -behavior by default. - -This helps pave the way to retire the spl_kmem_availrmem() -functionality in the SPL layer. This was the only caller. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Issue #938 ---- - module/zfs/arc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module/zfs/arc.c b/module/zfs/arc.c -index 09924db..b7499ee 100644 ---- a/module/zfs/arc.c -+++ b/module/zfs/arc.c -@@ -189,7 +189,7 @@ - int zfs_arc_grow_retry = 0; - int zfs_arc_shrink_shift = 0; - int zfs_arc_p_min_shift = 0; --int zfs_arc_memory_throttle_disable = 0; -+int zfs_arc_memory_throttle_disable = 1; - int zfs_disable_dup_eviction = 0; - int zfs_arc_meta_prune = 0; - --- -1.8.1.5 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-arc-read-panic.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-arc-read-panic.patch deleted file mode 100644 index 00ec1057efa1..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-arc-read-panic.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3db3ff4a787acf068b122562fb5be5aecec2611f Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@gentoo.org> -Date: Tue, 2 Jul 2013 00:07:15 -0400 -Subject: [PATCH] Use MAXPATHLEN instead of sizeof in snprintf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This silences a GCC 4.8.0 warning by fixing a programming error -caught by static analysis: - -../../cmd/ztest/ztest.c: In function ‘ztest_vdev_aux_add_remove’: -../../cmd/ztest/ztest.c:2584:33: error: argument to ‘sizeof’ - in ‘snprintf’ call is the same expression as the destination; - did you mean to provide an explicit length? - [-Werror=sizeof-pointer-memaccess] - (void) snprintf(path, sizeof (path), ztest_aux_template, - ^ - -Signed-off-by: Richard Yao <ryao@gentoo.org> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1480 ---- - cmd/ztest/ztest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c -index b38d7b1..93a5f1e 100644 ---- a/cmd/ztest/ztest.c -+++ b/cmd/ztest/ztest.c -@@ -2581,7 +2581,7 @@ enum ztest_object { - zs->zs_vdev_aux = 0; - for (;;) { - int c; -- (void) snprintf(path, sizeof (path), ztest_aux_template, -+ (void) snprintf(path, MAXPATHLEN, ztest_aux_template, - ztest_opts.zo_dir, ztest_opts.zo_pool, aux, - zs->zs_vdev_aux); - for (c = 0; c < sav->sav_count; c++) --- -1.8.1.6 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-getdents.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-getdents.patch deleted file mode 100644 index ce7d5c0494d9..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-getdents.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8f1e11b6105bf46a4258958eb3dcae2ab21ed8b2 Mon Sep 17 00:00:00 2001 -From: Caleb James DeLisle <calebdelisle@lavabit.com> -Date: Tue, 16 Apr 2013 05:23:39 -0400 -Subject: [PATCH] Remove .readdir from zpl_file_operations table - -The zpl_readdir() function shouldn't be registered as part of -the zpl_file_operations table, it must only be part of the -zpl_dir_file_operations table. By removing this callback -the VFS will now correctly return ENOTDIR when calling -getdents() on a file. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1404 ---- - module/zfs/zpl_file.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c -index 9c27b7f..db6a72c 100644 ---- a/module/zfs/zpl_file.c -+++ b/module/zfs/zpl_file.c -@@ -446,7 +446,6 @@ - .llseek = generic_file_llseek, - .read = zpl_read, - .write = zpl_write, -- .readdir = zpl_readdir, - .mmap = zpl_mmap, - .fsync = zpl_fsync, - #ifdef HAVE_FILE_FALLOCATE --- -1.8.1.6 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-txg_quiesce-deadlock.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-txg_quiesce-deadlock.patch deleted file mode 100644 index 8513e78882b1..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-txg_quiesce-deadlock.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 57f5a2008e2e6acf58934cf43c5fdca0faffa73e Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Thu, 25 Apr 2013 16:29:22 -0700 -Subject: [PATCH] Fix txg_quiesce thread deadlock - -A deadlock was accidentally introduced by commit e95853a which -can occur when the system is under memory pressure. What happens -is that while the txg_quiesce thread is holding the tx->tx_cpu -locks it enters memory reclaim. In the context of this memory -reclaim it then issues synchronous I/O to a ZVOL swap device. -Because the txg_quiesce thread is holding the tx->tx_cpu locks -a new txg cannot be opened to handle the I/O. Deadlock. - -The fix is straight forward. Move the memory allocation outside -the critical region where the tx->tx_cpu locks are held. And for -good measure change the offending allocation to KM_PUSHPAGE to -ensure it never attempts to issue I/O during reclaim. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Issue #1274 ---- - module/zfs/dsl_pool.c | 2 +- - module/zfs/txg.c | 14 +++++++------- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c -index 704f034..771b265 100644 ---- a/module/zfs/dsl_pool.c -+++ b/module/zfs/dsl_pool.c -@@ -143,7 +143,7 @@ - { - txg_history_t *th, *rm; - -- th = kmem_zalloc(sizeof(txg_history_t), KM_SLEEP); -+ th = kmem_zalloc(sizeof(txg_history_t), KM_PUSHPAGE); - mutex_init(&th->th_lock, NULL, MUTEX_DEFAULT, NULL); - th->th_kstat.txg = txg; - th->th_kstat.state = TXG_STATE_OPEN; -diff --git a/module/zfs/txg.c b/module/zfs/txg.c -index c7c3df3..7c820af 100644 ---- a/module/zfs/txg.c -+++ b/module/zfs/txg.c -@@ -367,6 +367,13 @@ - tx->tx_open_txg++; - - /* -+ * Now that we've incremented tx_open_txg, we can let threads -+ * enter the next transaction group. -+ */ -+ for (c = 0; c < max_ncpus; c++) -+ mutex_exit(&tx->tx_cpu[c].tc_lock); -+ -+ /* - * Measure how long the txg was open and replace the kstat. - */ - th = dsl_pool_txg_history_get(dp, txg); -@@ -376,13 +383,6 @@ - dsl_pool_txg_history_add(dp, tx->tx_open_txg); - - /* -- * Now that we've incremented tx_open_txg, we can let threads -- * enter the next transaction group. -- */ -- for (c = 0; c < max_ncpus; c++) -- mutex_exit(&tx->tx_cpu[c].tc_lock); -- -- /* - * Quiesce the transaction group by waiting for everyone to txg_exit(). - */ - start = gethrtime(); --- -1.8.1.6 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-1.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-1.patch deleted file mode 100644 index b4801708ae35..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-1.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f706421173c571371afff5e2a2ee0784c5e3f95d Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Wed, 17 Apr 2013 13:07:36 -0700 -Subject: [PATCH] Correctly return ERANGE in getxattr(2) - -According to the getxattr(2) man page the ERANGE errno should be -returned when the size of the value buffer is to small to hold the -result. Prior to this patch the implementation would just truncate -the value to size bytes. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1408 ---- - module/zfs/zpl_xattr.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c -index c03764f..a7e38e6 100644 ---- a/module/zfs/zpl_xattr.c -+++ b/module/zfs/zpl_xattr.c -@@ -225,6 +225,11 @@ - goto out; - } - -+ if (size < i_size_read(xip)) { -+ error = -ERANGE; -+ goto out; -+ } -+ - error = zpl_read_common(xip, value, size, 0, UIO_SYSSPACE, 0, cr); - out: - if (xip) -@@ -263,9 +268,12 @@ - if (!size) - return (nv_size); - -- memcpy(value, nv_value, MIN(size, nv_size)); -+ if (size < nv_size) -+ return (-ERANGE); -+ -+ memcpy(value, nv_value, nv_size); - -- return (MIN(size, nv_size)); -+ return (nv_size); - } - - static int --- -1.8.1.6 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-2.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-2.patch deleted file mode 100644 index bb4b1c4a3a34..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0377189b884fab7db02a95088e05712c7cf336f7 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Wed, 8 May 2013 09:20:04 -0700 -Subject: [PATCH] Only check directory xattr on ENOENT - -When SA xattrs are enabled only fallback to checking the directory -xattrs when the name is not found as a SA xattr. Otherwise, the SA -error which should be returned to the caller is overwritten by the -directory xattr errors. Positive return values indicating success -will also be immediately returned. - -In the case of #1437 the ERANGE error was being correctly returned -by zpl_xattr_get_sa() only to be overridden with ENOENT which was -returned by the subsequent unnessisary call to zpl_xattr_get_dir(). - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1437 ---- - module/zfs/zpl_xattr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c -index a7e38e6..eb2c00d 100644 ---- a/module/zfs/zpl_xattr.c -+++ b/module/zfs/zpl_xattr.c -@@ -288,7 +288,7 @@ - - if (zsb->z_use_sa && zp->z_is_sa) { - error = zpl_xattr_get_sa(ip, name, value, size); -- if (error >= 0) -+ if (error != -ENOENT) - goto out; - } - --- -1.8.1.6 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch deleted file mode 100644 index e59c869eed04..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ab68b6e5db29abcd20c0c7b12a8c2fa570031c8b Mon Sep 17 00:00:00 2001 -From: Tim Chase <tim@chase2k.com> -Date: Mon, 24 Jun 2013 22:03:56 -0500 -Subject: [PATCH] Fix zfs_sb_teardown/zfs_resume_fs NULL dereference - -Fix a pair of conditions in which a concurrent umount can cause -NULL pointer dereferences: - -* zfs_sb_teardown - prevent a NULL dereference by not calling - dmu_objset_pool with a null z_os. - -* zfs_resume_fs - don't try to unmount with a null z_os. This - change makes the ZoL code more consistent - with both Illumos and FreeBSD. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1543 ---- - module/zfs/zfs_vfsops.c | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c -index e618f2b..602c332 100644 ---- a/module/zfs/zfs_vfsops.c -+++ b/module/zfs/zfs_vfsops.c -@@ -1056,10 +1056,12 @@ - } - - /* -- * Drain the iput_taskq to ensure all active references to the -+ * If someone has not already unmounted this file system, -+ * drain the iput_taskq to ensure all active references to the - * zfs_sb_t have been handled only then can it be safely destroyed. - */ -- taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os))); -+ if (zsb->z_os) -+ taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os))); - - /* - * Close the zil. NB: Can't close the zil while zfs_inactive -@@ -1480,10 +1482,11 @@ - - if (err) { - /* -- * Since we couldn't reopen zfs_sb_t, force -- * unmount this file system. -+ * Since we couldn't reopen zfs_sb_t or, setup the -+ * sa framework, force unmount this file system. - */ -- (void) zfs_umount(zsb->z_sb); -+ if (zsb->z_os) -+ (void) zfs_umount(zsb->z_sb); - } - return (err); - } --- -1.8.1.6 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch deleted file mode 100644 index 7cca7d1137c8..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 76351672c222f28ea1b681097a9eff58a6791555 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Thu, 11 Jul 2013 14:11:32 -0700 -Subject: [PATCH] Fix zfsctl_expire_snapshot() deadlock - -It is possible for an automounted snapshot which is expiring to -deadlock with a manual unmount of the snapshot. This can occur -because taskq_cancel_id() will block if the task is currently -executing until it completes. But it will never complete because -zfsctl_unmount_snapshot() is holding the zsb->z_ctldir_lock which -zfsctl_expire_snapshot() must acquire. - ----------------------- z_unmount/0:2153 --------------------- - mutex_lock <blocking on zsb->z_ctldir_lock> - zfsctl_unmount_snapshot - zfsctl_expire_snapshot - taskq_thread - -------------------------- zfs:10690 ------------------------- - taskq_wait_id <waiting for z_unmount to exit> - taskq_cancel_id - __zfsctl_unmount_snapshot - zfsctl_unmount_snapshot <takes zsb->z_ctldir_lock> - zfs_unmount_snap - zfs_ioc_destroy_snaps_nvl - zfsdev_ioctl - do_vfs_ioctl - -We resolve the deadlock by dropping the zsb->z_ctldir_lock before -calling __zfsctl_unmount_snapshot(). The lock is only there to -prevent concurrent modification to the zsb->z_ctldir_snaps AVL -tree. Moreover, we're careful to remove the zfs_snapentry_t from -the AVL tree before dropping the lock which ensures no other tasks -can find it. On failure it's added back to the tree. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Signed-off-by: Chris Dunlap <cdunlap@llnl.gov> -Closes #1527 ---- - module/zfs/zfs_ctldir.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c -index 4fa530b..168f853 100644 ---- a/module/zfs/zfs_ctldir.c -+++ b/module/zfs/zfs_ctldir.c -@@ -732,7 +732,11 @@ struct inode * - sep = avl_find(&zsb->z_ctldir_snaps, &search, NULL); - if (sep) { - avl_remove(&zsb->z_ctldir_snaps, sep); -+ mutex_exit(&zsb->z_ctldir_lock); -+ - error = __zfsctl_unmount_snapshot(sep, flags); -+ -+ mutex_enter(&zsb->z_ctldir_lock); - if (error == EBUSY) - avl_add(&zsb->z_ctldir_snaps, sep); - else -@@ -767,7 +771,11 @@ struct inode * - while (sep != NULL) { - next = AVL_NEXT(&zsb->z_ctldir_snaps, sep); - avl_remove(&zsb->z_ctldir_snaps, sep); -+ mutex_exit(&zsb->z_ctldir_lock); -+ - error = __zfsctl_unmount_snapshot(sep, flags); -+ -+ mutex_enter(&zsb->z_ctldir_lock); - if (error == EBUSY) { - avl_add(&zsb->z_ctldir_snaps, sep); - (*count)++; --- -1.8.1.6 - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zvol-initialization-r1.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zvol-initialization-r1.patch deleted file mode 100644 index b1e7d3736db0..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zvol-initialization-r1.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff --git a/module/zfs/spa.c b/module/zfs/spa.c -index e986e92..65f78b7 100644 ---- a/module/zfs/spa.c -+++ b/module/zfs/spa.c -@@ -64,6 +64,7 @@ - #include <sys/zfs_ioctl.h> - #include <sys/dsl_scan.h> - #include <sys/zfeature.h> -+#include <sys/zvol.h> - - #ifdef _KERNEL - #include <sys/bootprops.h> -@@ -2856,6 +2857,7 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy, - spa_load_state_t state = SPA_LOAD_OPEN; - int error; - int locked = B_FALSE; -+ int firstopen = B_FALSE; - - *spapp = NULL; - -@@ -2879,6 +2881,8 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy, - if (spa->spa_state == POOL_STATE_UNINITIALIZED) { - zpool_rewind_policy_t policy; - -+ firstopen = B_TRUE; -+ - zpool_get_rewind_policy(nvpolicy ? nvpolicy : spa->spa_config, - &policy); - if (policy.zrp_request & ZPOOL_DO_REWIND) -@@ -2953,6 +2957,11 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy, - mutex_exit(&spa_namespace_lock); - } - -+#ifdef _KERNEL -+ if (firstopen) -+ zvol_create_minors(spa->spa_name); -+#endif -+ - *spapp = spa; - - return (0); -@@ -4010,6 +4019,10 @@ spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags) - mutex_exit(&spa_namespace_lock); - spa_history_log_version(spa, LOG_POOL_IMPORT); - -+#ifdef _KERNEL -+ zvol_create_minors(pool); -+#endif -+ - return (0); - } - -diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c -index 1226b2c..a9184a1 100644 ---- a/module/zfs/zfs_ioctl.c -+++ b/module/zfs/zfs_ioctl.c -@@ -1268,9 +1268,6 @@ zfs_ioc_pool_import(zfs_cmd_t *zc) - error = err; - } - -- if (error == 0) -- zvol_create_minors(zc->zc_name); -- - nvlist_free(config); - - if (props) -diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c -index 43a7bb6..e35c91b 100644 ---- a/module/zfs/zvol.c -+++ b/module/zfs/zvol.c -@@ -1215,6 +1215,9 @@ zvol_alloc(dev_t dev, const char *name) - - zv = kmem_zalloc(sizeof (zvol_state_t), KM_SLEEP); - -+ spin_lock_init(&zv->zv_lock); -+ list_link_init(&zv->zv_next); -+ - zv->zv_queue = blk_init_queue(zvol_request, &zv->zv_lock); - if (zv->zv_queue == NULL) - goto out_kmem; -@@ -1248,9 +1251,6 @@ zvol_alloc(dev_t dev, const char *name) - sizeof (rl_t), offsetof(rl_t, r_node)); - zv->zv_znode.z_is_zvol = TRUE; - -- spin_lock_init(&zv->zv_lock); -- list_link_init(&zv->zv_next); -- - zv->zv_disk->major = zvol_major; - zv->zv_disk->first_minor = (dev & MINORMASK); - zv->zv_disk->fops = &zvol_ops; -@@ -1561,30 +1561,36 @@ zvol_init(void) - { - int error; - -+ list_create(&zvol_state_list, sizeof (zvol_state_t), -+ offsetof(zvol_state_t, zv_next)); -+ mutex_init(&zvol_state_lock, NULL, MUTEX_DEFAULT, NULL); -+ - zvol_taskq = taskq_create(ZVOL_DRIVER, zvol_threads, maxclsyspri, - zvol_threads, INT_MAX, TASKQ_PREPOPULATE); - if (zvol_taskq == NULL) { - printk(KERN_INFO "ZFS: taskq_create() failed\n"); -- return (-ENOMEM); -+ error = -ENOMEM; -+ goto out1; - } - - error = register_blkdev(zvol_major, ZVOL_DRIVER); - if (error) { - printk(KERN_INFO "ZFS: register_blkdev() failed %d\n", error); -- taskq_destroy(zvol_taskq); -- return (error); -+ goto out2; - } - - blk_register_region(MKDEV(zvol_major, 0), 1UL << MINORBITS, - THIS_MODULE, zvol_probe, NULL, NULL); - -- mutex_init(&zvol_state_lock, NULL, MUTEX_DEFAULT, NULL); -- list_create(&zvol_state_list, sizeof (zvol_state_t), -- offsetof(zvol_state_t, zv_next)); -+ return (0); - -- (void) zvol_create_minors(NULL); -+out2: -+ taskq_destroy(zvol_taskq); -+out1: -+ mutex_destroy(&zvol_state_lock); -+ list_destroy(&zvol_state_list); - -- return (0); -+ return (error); - } - - void -diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh -index 141348c..281166c 100755 ---- a/scripts/zconfig.sh -+++ b/scripts/zconfig.sh -@@ -264,8 +264,9 @@ test_4() { - zconfig_zvol_device_stat 0 ${POOL_NAME} ${FULL_ZVOL_NAME} \ - ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 9 - -- # Load the modules, wait 1 second for udev -+ # Load the modules, list the pools to ensure they are opened - ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 10 -+ ${ZPOOL} list &>/dev/null - - # Verify the devices were created - zconfig_zvol_device_stat 10 ${POOL_NAME} ${FULL_ZVOL_NAME} \ -diff --git a/udev/rules.d/90-zfs.rules.in b/udev/rules.d/90-zfs.rules.in -index 52e1d63..a2715d2 100644 ---- a/udev/rules.d/90-zfs.rules.in -+++ b/udev/rules.d/90-zfs.rules.in -@@ -1,4 +1,4 @@ --SUBSYSTEM!="block", GOTO="zfs_end" -+SUBSYSTEM!="block|misc", GOTO="zfs_end" - ACTION!="add|change", GOTO="zfs_end" - - ENV{ID_FS_TYPE}=="zfs", RUN+="/sbin/modprobe zfs" -@@ -7,4 +7,6 @@ ENV{ID_FS_TYPE}=="zfs_member", RUN+="/sbin/modprobe zfs" - KERNEL=="null", SYMLINK+="root" - SYMLINK=="null", SYMLINK+="root" - -+SUBSYSTEM=="misc", KERNEL=="zfs", RUN+="@sbindir@/zpool list" -+ - LABEL="zfs_end" diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-linux-3.10-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-linux-3.10-compat.patch deleted file mode 100644 index 90755a1a527f..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-linux-3.10-compat.patch +++ /dev/null @@ -1,108 +0,0 @@ -commit a1d9543a39942be56879ca9338078afc77c25cea -Author: Chris Dunlop <chris@onthe.net.au> -Date: Mon Jun 3 16:58:52 2013 +1000 - - 3.10 API change: block_device_operations->release() returns void - - Linux kernel commit torvalds/linux@db2a144 changed the return type - of block_device_operations->release() to void. Detect the expected - prototype and defined our callout accordingly. - - Signed-off-by: Chris Dunlop <chris@onthe.net.au> - Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> - Closes #1494 - -diff --git a/config/kernel-bdev-block-device-operations.m4 b/config/kernel-bdev-block-device-operations.m4 -index 8b5e0a3..faacc19 100644 ---- a/config/kernel-bdev-block-device-operations.m4 -+++ b/config/kernel-bdev-block-device-operations.m4 -@@ -10,7 +10,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS], [ - - int blk_open(struct block_device *bdev, fmode_t mode) - { return 0; } -- int blk_release(struct gendisk *g, fmode_t mode) { return 0; } - int blk_ioctl(struct block_device *bdev, fmode_t mode, - unsigned x, unsigned long y) { return 0; } - int blk_compat_ioctl(struct block_device * bdev, fmode_t mode, -@@ -19,7 +18,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS], [ - static const struct block_device_operations - bops __attribute__ ((unused)) = { - .open = blk_open, -- .release = blk_release, -+ .release = NULL, - .ioctl = blk_ioctl, - .compat_ioctl = blk_compat_ioctl, - }; -diff --git a/config/kernel-block-device-operations-release-void.m4 b/config/kernel-block-device-operations-release-void.m4 -new file mode 100644 -index 0000000..a73f858 ---- /dev/null -+++ b/config/kernel-block-device-operations-release-void.m4 -@@ -0,0 +1,29 @@ -+dnl # -+dnl # 3.10.x API change -+dnl # -+AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [ -+ AC_MSG_CHECKING([whether block_device_operations.release is void]) -+ tmp_flags="$EXTRA_KCFLAGS" -+ EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" -+ ZFS_LINUX_TRY_COMPILE([ -+ #include <linux/blkdev.h> -+ -+ void blk_release(struct gendisk *g, fmode_t mode) { return; } -+ -+ static const struct block_device_operations -+ bops __attribute__ ((unused)) = { -+ .open = NULL, -+ .release = blk_release, -+ .ioctl = NULL, -+ .compat_ioctl = NULL, -+ }; -+ ],[ -+ ],[ -+ AC_MSG_RESULT(void) -+ AC_DEFINE(HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID, 1, -+ [struct block_device_operations.release returns void]) -+ ],[ -+ AC_MSG_RESULT(int) -+ ]) -+ EXTRA_KCFLAGS="$tmp_flags" -+]) -diff --git a/config/kernel.m4 b/config/kernel.m4 -index 7b8e3b0..46c0255 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -7,6 +7,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ - ZFS_AC_TEST_MODULE - ZFS_AC_KERNEL_CONFIG - ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS -+ ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID - ZFS_AC_KERNEL_TYPE_FMODE_T - ZFS_AC_KERNEL_KOBJ_NAME_LEN - ZFS_AC_KERNEL_3ARG_BLKDEV_GET -diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c -index e35c91b..b516156 100644 ---- a/module/zfs/zvol.c -+++ b/module/zfs/zvol.c -@@ -1024,7 +1024,11 @@ out_mutex: - return (error); - } - -+#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID -+static void -+#else - static int -+#endif - zvol_release(struct gendisk *disk, fmode_t mode) - { - zvol_state_t *zv = disk->private_data; -@@ -1044,7 +1048,9 @@ zvol_release(struct gendisk *disk, fmode_t mode) - if (drop_mutex) - mutex_exit(&zvol_state_lock); - -+#ifndef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID - return (0); -+#endif - } - - static int diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.5-discard-on-zvol-fix.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.5-discard-on-zvol-fix.patch deleted file mode 100644 index 632d08d28e1f..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.5-discard-on-zvol-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 96165264ad0afe7a5d440ef49f9712a188486266 Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@gentoo.org> -Date: Fri, 18 Sep 2015 08:32:52 -0400 -Subject: [PATCH] Discard on zvols should not exceed the length of a block - -37f9dac592bf5889c3efb305c48ac39b4c7dd140 replaced the end-start -calculation with a cached value, but neglected to update it on discard -operations. This can cause us to discard data not requested, causing -data loss on zvols. - -Reported-by: Richard Connon <richard.connon@zynstra.com> -Signed-off-by: Richard Yao <ryao@gentoo.org> ---- - module/zfs/zvol.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c -index 492f8ff..c5a8071 100644 ---- a/module/zfs/zvol.c -+++ b/module/zfs/zvol.c -@@ -661,6 +661,7 @@ zvol_discard(struct bio *bio) - if (!(bio->bi_rw & REQ_SECURE)) { - start = P2ROUNDUP(start, zv->zv_volblocksize); - end = P2ALIGN(end, zv->zv_volblocksize); -+ size = end - start; - } - #endif - --- -2.4.6 - diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild deleted file mode 100644 index cf47024ea92d..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "9999" ] ; then - inherit git-2 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz" - S="${WORKDIR}/zfs-zfs-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="test" - -DEPEND=" - =sys-kernel/spl-${PV}* - virtual/awk - dev-lang/perl -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - BLK_DEV_LOOP - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD - DEVTMPFS" - - kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 3 8 || die "Linux 3.8 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Fix regression where snapshots are not visible - epatch "${FILESDIR}/${P}-fix-invisible-snapshots.patch" - - # Fix deadlock involving concurrent `zfs destroy` and `zfs list` commands - epatch "${FILESDIR}/${P}-fix-recursive-reader.patch" - - # Fix USE=debug build failure involving GCC 4.7 - epatch "${FILESDIR}/${P}-gcc-4.7-compat.patch" - - # Cast constant for 32-bit compatibility - epatch "${FILESDIR}/${PN}-0.6.0_rc14-cast-const-for-32bit-compatibility.patch" - - # Handle missing name length check in Linux VFS - epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch" - - # Fix barrier regression on Linux 2.6.37 and later - epatch "${FILESDIR}/${PN}-0.6.0_rc14-flush-properly.patch" - fi - - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install -} - -pkg_postinst() { - linux-mod_pkg_postinst - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild deleted file mode 100644 index 83e7fafaae31..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "9999" ] ; then - inherit git-2 - MY_PV=9999 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz" - S="${WORKDIR}/zfs-zfs-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - BLK_DEV_LOOP - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD - DEVTMPFS" - - kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Cast constant for 32-bit compatibility - epatch "${FILESDIR}/${P}-cast-const-for-32bit-compatibility.patch" - - # Handle missing name length check in Linux VFS - epatch "${FILESDIR}/${P}-vfs-name-length-compatibility.patch" - - # Fix NULL pointer exception on hardened kernels, bug #457176 - epatch "${FILESDIR}/${P}-improved-hardened-support.patch" - - # Fix barrier regression on Linux 2.6.37 and later - epatch "${FILESDIR}/${P}-flush-properly.patch" - - # Improve accuracy of autotools checks - epatch "${FILESDIR}/${P}-improved-autotools-checks.patch" - - # Linux 3.9 Support - epatch "${FILESDIR}/${P}-linux-3.9-compat.patch" - - # Do not second guess Linux's memory management - epatch "${FILESDIR}/${P}-zfs_arc_memory_throttle_disable.patch" - fi - - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown - - # Provide /usr/src/zfs symlink for lustre - dosym "$(basename $(echo "${ED}/usr/src/zfs-"*))/${KV_FULL}" /usr/src/zfs -} - -pkg_postinst() { - linux-mod_pkg_postinst - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux introduces support for features flags." - ewarn "If you upgrade your pools to make use of feature flags, you will lose" - ewarn "the ability to import them using older versions of ZFSOnLinux." - ewarn "Any new pools will be created with feature flag support and will" - ewarn "not be compatible with older versions of ZFSOnLinux. To create a new" - ewarn "pool that is backward compatible, use zpool create -o version=28 ..." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.1-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.1-r2.ebuild deleted file mode 100644 index 73671492db28..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.1-r2.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "9999" ] ; then - inherit git-2 - MY_PV=9999 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz" - S="${WORKDIR}/zfs-zfs-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - BLK_DEV_LOOP - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !UIDGID_STRICT_TYPE_CHECKS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD - DEVTMPFS" - - kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 3 10 || die "Linux 3.10 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Correctness fix for getdents - epatch "${FILESDIR}/${P}-fix-getdents.patch" - - # Prevent possible deadlock regression - epatch "${FILESDIR}/${P}-fix-txg_quiesce-deadlock.patch" - - # Correctness fixes for xattr - epatch "${FILESDIR}/${P}-fix-xattr-behavior-1.patch" - epatch "${FILESDIR}/${P}-fix-xattr-behavior-2.patch" - - # Make certain that zvols always appear - epatch "${FILESDIR}/${P}-fix-zvol-initialization-r1.patch" - - # Linux 3.10 Compatibility - epatch "${FILESDIR}/${PN}-0.6.1-linux-3.10-compat.patch" - - # ARC Read Panic Fix - epatch "${FILESDIR}/${PN}-0.6.1-fix-arc-read-panic.patch" - - # Fix zfsctl_expire_snapshot deadlock - epatch "${FILESDIR}/${PN}-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch" - - # Fix NULL pointer dereference in zfsctl_expire_snapshot - epatch "${FILESDIR}/${PN}-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch" - fi - - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown - - # Provide /usr/src/zfs symlink for lustre - dosym "$(basename $(echo "${ED}/usr/src/zfs-"*))/${KV_FULL}" /usr/src/zfs -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for features flags." - ewarn "If you upgrade your pools to make use of feature flags, you will lose" - ewarn "the ability to import them using older versions of ZFSOnLinux." - ewarn "Any new pools will be created with feature flag support and will" - ewarn "not be compatible with older versions of ZFSOnLinux. To create a new" - ewarn "pool that is backward compatible, use zpool create -o version=28 ..." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild deleted file mode 100644 index 179739a94410..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "9999" ] ; then - inherit git-2 - MY_PV=9999 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz - https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz" - S="${WORKDIR}/zfs-zfs-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - BLK_DEV_LOOP - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD - DEVTMPFS" - - kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 3 12 || die "Linux 3.12 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${PN}-${MY_PV}-patches" - fi - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for features flags." - ewarn "If you upgrade your pools to make use of feature flags, you will lose" - ewarn "the ability to import them using older versions of ZFSOnLinux." - ewarn "Any new pools will be created with feature flag support and will" - ewarn "not be compatible with older versions of ZFSOnLinux. To create a new" - ewarn "pool that is backward compatible, use zpool create -o version=28 ..." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild deleted file mode 100644 index 0b675bc3253c..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "9999" ] ; then - inherit git-2 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz - https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-${PR}.tar.xz" - S="${WORKDIR}/zfs-zfs-${PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - BLK_DEV_LOOP - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !PAX_RANDKSTACK - !PAX_USERCOPY_SLABS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 3 17 || die "Linux 3.17 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/zfs-${PV}-patches" - fi - - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for features flags." - ewarn "If you upgrade your pools to make use of feature flags, you will lose" - ewarn "the ability to import them using older versions of ZFSOnLinux." - ewarn "Any new pools will be created with feature flag support and will" - ewarn "not be compatible with older versions of ZFSOnLinux. To create a new" - ewarn "pool that is backward compatible, use zpool create -o version=28 ..." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild deleted file mode 100644 index b19cd598f867..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "9999" ] ; then - inherit git-2 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-zfs-${PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - BLK_DEV_LOOP - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !PAX_USERCOPY_SLABS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 1 || die "Linux 4.1 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with ZFSOnLinux 0.6.3 and GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible, use " - ewarn "zpool create -o version=28 ..." - ewarn "Then explicitly enable older features. Note that the LZ4 feature has" - ewarn "been upgraded to support metadata compression and has not been" - ewarn "tested against the older GRUB2 code base. GRUB2 support will be" - ewarn "updated as soon as the GRUB2 developers and Open ZFS community write" - ewarn "GRUB2 patchese that pass mutual review." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild deleted file mode 100644 index 89ab1f556502..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "9999" ] ; then - inherit git-2 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-zfs-${PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - BLK_DEV_LOOP - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !PAX_USERCOPY_SLABS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 2 || die "Linux 4.2 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Fix zvol data loss regression - # https://github.com/zfsonlinux/zfs/pull/3798 - epatch "${FILESDIR}/${P}-discard-on-zvol-fix.patch" - fi - - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.10.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.10.ebuild deleted file mode 100644 index ddbb09881e76..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.10.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 12 || die "Linux 4.12 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild deleted file mode 100644 index b6b9fe5951cc..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "9999" ] ; then - inherit git-2 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-zfs-${PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !PAX_USERCOPY_SLABS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild deleted file mode 100644 index 820a3730461d..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz - https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p3.tar.xz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !<sys-kernel/spl-0.6.5.3-r1 - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 4 || die "Linux 4.4 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/zfs-${PV}-patches" - fi - - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild deleted file mode 100644 index 95f4d0eea20c..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild index fdbff506ec4e..2b7c7f36b229 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild deleted file mode 100644 index bda3a991ca09..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild deleted file mode 100644 index b22b3b796e2e..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 5 || die "Linux 4.5 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild deleted file mode 100644 index 4d295e7b233b..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 6 || die "Linux 4.6 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild deleted file mode 100644 index dc3011a0f159..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 8 || die "Linux 4.8 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.9.ebuild deleted file mode 100644 index eba247a785f6..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.9.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 10 || die "Linux 4.10 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild deleted file mode 100644 index ddbb09881e76..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 12 || die "Linux 4.12 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.1.ebuild deleted file mode 100644 index ddbb09881e76..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 12 || die "Linux 4.12 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.2.ebuild deleted file mode 100644 index 6de1cb67ef13..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 05fbcf636d94..77143f2d22e7 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,66 +1,12 @@ -AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831 SHA512 e7ccb7179c4c455c496daab192099d7553674b9505801e25a2ea8c67a1b4de15d68ac99b2c3347c1f3454f88ede7694f08da61c5d061f0577bb1594ca4a90f12 WHIRLPOOL 79dfdc9c80a707f6bb39bea51ec451c16b821886ce3e84c73a249313d991cf8019f0647b0fe439754fc1ad08cb294bf4c245955fdc4af30286a8afd61dba21ba AUX bash-completion-r1 11310 SHA256 b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e WHIRLPOOL b09558e80a96993c52915093c1c3f8488d0ef9294d2e401546c21998222f377e211ff368e18e8ba3b1dea7554a467cc3e32c882a1d872719d82f5e2c1ccd5848 -AUX zed 442 SHA256 feaa9731242d6cc9d497ab1cd729eac1bcb2cc5b6eead1120000d33bb62d417f SHA512 b128ec3b37aa9b55fa50a807af91a85190d2cb32395468605e139c352a0db56297e5086615342384bb6e1c092bf0950301ce4e51000db610b50628502cc8b0bb WHIRLPOOL 9bd1c42c05c16ce52883444c144ee8c740aac709888d3ba4d3609e3413fbcd6a6d82b9514f7ac200fdc993930da31993c8b0a16b46b3d13e44b52e70d7f186d4 -AUX zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch 1159 SHA256 bd40a60408772cfe789bd0f055906cd2aebf43761adb2cb19ca6219c92c5f996 SHA512 aba0ee09e0070ee7472ffeb0274fdac1870e6a11390c110e9febd7240eb8465351355ce6b735d3f0a6ce2ce5bd167a4239ececc3dae33899df3b4f72c162f037 WHIRLPOOL 72635866ef46b592d257071d4902d36b95855850e40de0b6a6afc6ad416460ebdc5b2ece67d011a052895ab6ae9135d77622f7fb15f4cc0f3a6b96df6c2581d2 -AUX zfs-0.6.1-avoid-zdb-abort.patch 844 SHA256 651ece4a40b842c00d393d3f969435f733a987cc420f9a300ed2bd1c78e94dba SHA512 d976e0a829ddad680449d0a4d89a7130fb113668bf6766e3004df47a14620e26910e3d0f7cc2f8d5a7cef4a7ba3794ed36624d63ee6c577585d80964e931becf WHIRLPOOL fa47408a8116d5b72f322bbe878f2275febfca613e8718406ed566be23a4a8715113be66c1694c4272f6fc5c26aae78dbd2de31c095aa0cf95dbc7d13d276d4c -AUX zfs-0.6.1-fix-gcc-4.8-warning.patch 1432 SHA256 2a2fb2a0b4960e7c616f4bb27a2a1ddf6dfcef30eb6b22ead20d70fe58055c1e SHA512 6063ad756aac5df4b850fb79630696f0616e3a906463bdce147b07383ed1cba47a60e02eac3cc2888fb92f9915e6ff8e28ca36c4e3d11cc9e65391c68a79d972 WHIRLPOOL 4d0432ca6468d44de7a870e03d20497eeb39b1e373d843862a695622b9d69e8eff6f3d52471b7756f80c9392ae12a797b6665c4d27f73710f67f0ee1aaafcbad -AUX zfs-0.6.1-fix-zvol-initialization-r1.patch 4803 SHA256 36f778dc0fa3c3c7aa4f2383e9463a75c51da19a1a719018f729e9d42ffb52ed SHA512 bfe5ee1185fe044cbf758414b0c8bc4311de6b0502a6f0c6a8fecec71402376f0ab4aa7e798f870c262f54d77f6b84590cc2ae371ff4880dcd97b834ac443483 WHIRLPOOL 3932ef6eea9ed0f23146f980504540843b04a684d5c55cdb5aec60d9fdb18354d61e485b55f5a0f2561ed3e379accd6b3d3f7c39bdbc91bc0d3194546e75ec5e -AUX zfs-0.6.1-gentoo-openrc-dependencies.patch 2416 SHA256 01b4def8e15eb8854d87529d4540b7b85c927b64e81112cecf13a5aa30c1bc31 SHA512 d4012fb14f3c599d763b6412c092b95d76297afd4d65b71a602485357505aa1fbdc7f5ad437b5634365311349f1a29adcc1dd0e7d20cb85802ce58c0dd393d3c WHIRLPOOL 9c4e3ece9773efc5ec99f9a453eca4656d8e64ac47735878313cddbae8a64ba34503c4a3dd206e658c47f1b9360d545e497838e455af90b87ae4a935d28172f6 -AUX zfs-0.6.5-fix-openrc-scripts.patch 8250 SHA256 a71d6e0cc37684deb588e64ff4fa4bdeae6d45e04f2cb90c4b21d71be0a4f7e4 SHA512 f28b2884706ac38b71d08dd1a49bd9e41450069814a3f51ebfebf6b8dd808bbcc9516d62f4c39c72b1276114fc9f920c679022e35c8acc3a5891e06ae8c85ee1 WHIRLPOOL 96d31aa51219097928eaa5cd71576c44f94f6727d5b7ae9077cebf30cb7e4da0babced6a1baa47ef8d135e37406386ee579bbdacea6557af9836adbf7163c9c2 AUX zfs-init.sh.in 582 SHA256 820cbbfe881315a640ea398c0c7eac60d2eeb191f694ef69f3e8ea725a8de085 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461 WHIRLPOOL 3e9ec22a60a9ba4e71cfab74b25d5ad4aff1b64bfb210d31fc36d5a768527e8b692fe3a9712d9f6bfa8f08e03f7e92ed035a3d8bf4e360b22fa4a4e5b9e9d214 AUX zfs.service.in 334 SHA256 a9db484e4087a814bdb24814895450c700246f1880fdfd4c29645bb7acd72f05 SHA512 f1066c8b06d2501be9c080a78bfd28ac7566a05bac5ddff7915836d083f8e791bbb2fd5e70a7633a0407762f12fd240d2ef049ed5244c4c4727e42f2332117e2 WHIRLPOOL 173449dcb7312c528d21eeb763936affc849f049e4b647d426296b3a35c5f0c86f056e4c0de7866c62a28344a8a734f42b34822fe5573f7873575be0434105b3 -DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798 -DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d -DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b -DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58 -DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50 -DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe -DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1 -DIST zfs-0.6.5.10.tar.gz 2597676 SHA256 90a0ca76667076e9f58776216cb761f68761eb0192f8b0c45893f84cabc6f27e SHA512 822004d11a1a7c0e258cce049bfee0248dd1ac225a922c1e4a25c8593f23e9b1d7aa4a45a1122f6904025ea0a8c7f4884ec4ab353bfa9c734aedb0969b8d6eb4 WHIRLPOOL 87596a0e89afd3b7da1476c996c87491ee3962f0accd0c1a50d9cd9ab4dd49b3c1c71e14c6eeeddfc53db9bba665bc525ef9580da8082b1e4426bce54ee83401 DIST zfs-0.6.5.11.tar.gz 2521959 SHA256 136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 WHIRLPOOL 867f6b22726ca13e43a5ff7a832610bbfd44e6c367bd314a20a7f0a03364b1c3bda1d7b3d7c3502e08249b8d8d9e8034e93d0200abb70f793352f7689e19deac -DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634 -DIST zfs-0.6.5.3-patches-p0.tar.xz 63780 SHA256 cc6d2881304738619b9d00bc55fbd358119b35cbb345cae2ecf538051f1b7fe7 SHA512 4a531fd10d1d4d9c9cabaad9c13d8112eab3641249a7ce44599288bc4510b444d132833fae2fdf922eff43670ce77d32972c7b5b4a7d70f80c3365a0dcc89b70 WHIRLPOOL adc20e7917a518c790007499763210a4d27a164abe00a86f76d64f56f0fafc459f5d5c483019acacc136e41c57894e669fd58956b3f0ac0bcafeb1e02fec7988 -DIST zfs-0.6.5.3-patches-p2.tar.xz 85996 SHA256 0e38b1bd7e2eb96c74b3eaab49c14f1f65fa02dc42b62b6015200185bfc911c7 SHA512 0a8fb131cc9a5a239a7434593000259a581b20ee7c6fef87ec2ea78281b7887151e219ebe66603b9dafaa4fa22cbf8c55175e1f6b36af4502c147c478f0b3e38 WHIRLPOOL 726bf1c05605943a205e2e70099c6cf8c7ba8cc9bbf34d45a2d56cea87c1e23166700979e47c82dd91bd1778e297dd211a0e6f48e0eab2392471218bcb5853ce -DIST zfs-0.6.5.3-patches-p3.tar.xz 88736 SHA256 031cd97765f890d9b78e1a5746cbd2a3ce06c7208693ec75c0b47324ac67b97a SHA512 8f17cc6e02a35828a57a7c2a437d9d18a41203b6e3f9e154b2ab863296b64596dc827afeeb0f993e37f47881d0f2ed4834f270d0ba843ab84b21c491cc352576 WHIRLPOOL 20f69c0a936bb612d5e3b551d4bf904aca3aff6d885d72f67f3b14cd720094ec13e383032ee4e322b0e81017d8ffcfafb47bf07f273badef34f7210d687ddacc -DIST zfs-0.6.5.3-patches-p4.tar.xz 89140 SHA256 34114671614aec3b33b17e6fc66a31549b3dd3e1d21ccd68d6987a1e1641f86b SHA512 3f8a4490e654a2d13bf4d31ee688276243244d4e0ab7c7911d597730bbbf6c9d7dea8e075409de4c22e871928cd647ce3064a671a1259f3adaf2b27bcc5370b8 WHIRLPOOL a63c0a2eff6c29c9600e4aaafa7120a0c1bd9bdf9b2f1e52d5a85df2c02e5e924ed74a406919cff9353a77c697dcf4248749ad6a7137f17dc427c7f0d63ea99a -DIST zfs-0.6.5.3.tar.gz 2524218 SHA256 49e6f9760ea172cb756f7357e4bcb90ee0293028540a68d62ed087724276131f SHA512 325cb91b7ddbcd6aa0bb9fc41eb0099dbb047a4e32d096fd414799729ef68cbc9c2e15714092eff8044a681af4ab552bd9ac1949cc673c6c5c3de1a23d9895ec WHIRLPOOL 957c3a75bb11befd4b74583883f2f11f717deb6bda368939b342049e809aa191a9ee8d1e709eaddc2a831418c7fdb5e763f918ff56d45f03baf4569ef8a4a070 -DIST zfs-0.6.5.4-patches-p1.tar.xz 64004 SHA256 83877d9b7c629730838325fd5b16bcb54259520e200f0539de9b8edfdcee9403 SHA512 9203356b43bdad2ed78c946af8c95c9fc4d2996b41a09a3b1f5a8657d2742ac69d10b4a87d443db497d591878cf7a70ebb19762b0df135ee25f4e8d2ed6ad71f WHIRLPOOL ff5788356d6a85608d22ea2c010a799464922614204c7eea06b57930a44ee876e596a053a773205de0543d36c04337d60c32594939e8e64d3022906c51c4d4e6 DIST zfs-0.6.5.4-patches-p2.tar.xz 63912 SHA256 bbcfe43ee4a46deed86543d23abd31bbc662408f56ef8f7c9500dc25fecd49c4 SHA512 9f598c2a750b92dadddb677a6a9dda4573fa91421a82270d8104d718da4b945a4d5412bab92037a033cec1ec177f2a0eb52207babd023847918e3754054ec5e9 WHIRLPOOL bab1330c7489dd172c522300698f6a2d670a2f6ddcf8cd2566d1daffe8b41a3667755ad1ab377d07716af66449f7332974bcd7df4647bb028b5f5279c59c428c DIST zfs-0.6.5.4.tar.gz 2506470 SHA256 780862ec2301ccace412a324787e9df762cff6046e73e2ac0ebdce9e2bd59b0f SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01 WHIRLPOOL eacd2ec09afdbc3f6d946583116296fadcd7d0dea5158c89f82f6d0b02e0cbf075712015bfa5f321ae5815cf86af13b39ce93e5026e6a00da58d9ddb04d12320 -DIST zfs-0.6.5.6.tar.gz 2561093 SHA256 c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff SHA512 94c55a50f0f9a90ce07a45dc72bb2730b2a41373ab5a12845df00ef38bb22e4a80ab2fb6e31a9c3a45e51516cdea441bb9da1d0acf71f2f88b38c7c3e9e995b0 WHIRLPOOL 6fcbe473bfce90f800989bac506fa6d4cf5662ad9ca617a477f1251c1625de906495a45759d6190e5a24dcf05f2ed3dd7ea1c0b2f243165a60e5efd098082935 -DIST zfs-0.6.5.7.tar.gz 2537816 SHA256 4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590 SHA512 559b826ae1a176217b92d8407729e2c5feeffb117dc9affaa8c9c2134d996b6c3cbe095f7a0c4666c9b131742491f1304eeb292e13e0df0b6d001fa620568af2 WHIRLPOOL bf2e0865de35496cc995738ddde34df797b0c5047c0dd17e5b755803ef16e7c16f8ba89927106a1f6131c2f75a6749c31a72dff95fc0fee186b308c50ce0b4f4 -DIST zfs-0.6.5.8.tar.gz 2521921 SHA256 d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84 SHA512 e5b53a9531b865e7c650892c0deb1ee81db086a33538cd667a087a8a8d33a0ad93a30ae5e800096abfc4dc8ed00843da924230082e204fb7543dd401ef41fcde WHIRLPOOL 623bf8ee51d59dcd1842bf41ccf19c2eb6813fb1e88dea1ea1c6f1388c11484b798546bdcb94500735a0e9e5f9099a4df43308760b353b5b62ff56af035f88bd -DIST zfs-0.6.5.9.tar.gz 2610650 SHA256 b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f SHA512 6e175f32421cf0f9e13429f12f0fac0564dc7059ab076831d0ebc4f6a17412160ca3526ebdf894bc7666e82580355b08701dd01c411d3177f82e7330b4529a37 WHIRLPOOL 149d730a26363b50691363b314669756d218c4a16e6d06e319c2b0866c5f8ed6e2da2396a516297c127d3343d51d78072d8b7371e3f4d327d30fa43c90be5cd3 -DIST zfs-0.7.0.tar.gz 6714094 SHA256 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2 SHA512 6e6cbf54399fc85b74b76a6ceb3f30e94903f755fe6386fccc56b5e6d307a907759e4b62acec5d32e8383ef1083423eaff8dee2b0ef01a99459171a42b47d217 WHIRLPOOL 74687be4220bab51f18fdd3c047400c4261acf16f38086c2485f5cb9d79af87f5adfafced92860b021814aece7446cb18e9ca310a363b90c6bac39343b72a4b6 -DIST zfs-0.7.1.tar.gz 6376234 SHA256 231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6 SHA512 64b0a3b5eeaf09ce824e3e029880a8e5dcb3e4567d1fb2fa24c89d8e55fee1ebe2d2f3a9f77d5468cc5637074e27d5ba7696b566829c93fd69c610b288200a37 WHIRLPOOL 700c83aadca96578ae8d6a9795f91c0c25b69afcc6ec6c02141daafcbcd550ae413438e96c4821c5c90816e0e29366ecfc3e7289623f14c255722c37d9f9a7f6 -DIST zfs-0.7.2.tar.gz 6389699 SHA256 f75f4d8bbb8241e3d06321b53914e53fa22d1ccc8be89819b578b46e5d3e5cf4 SHA512 fd10350b3ba5906b8d4968cee4f9febcc475b49e7d5499209566f7cfa39f29c4c2c1a4bae0698ce98244fa66657e7956a8c170de1e5f13b1bc05d2861d2c7722 WHIRLPOOL b1e270bddf9d34a6d60a9f3d80f767d6a19a7c2ae5b51d3fe83fb28432e267d494cd5b4f003b6049a074e8bf65fa9179793dec0b40f366cea493f7993dd3d19d DIST zfs-0.7.3.tar.gz 6393145 SHA256 cb8fc606835d3f91471e49aca31a6a0a71733b1cbe74fa510e0fe0efa670fe51 SHA512 fe116fd787050f7bc099fe3ed5335c2d18711e5e665af5be13b3971939258e036e273432e80106e704f037d1f6e3114b12e26b01f97b575723f8bd46acdcbf61 WHIRLPOOL 4a7442898bd8855c24c8cdbd8d58b02dfb41ba5e55096ad20afb61c9a2903fd5aa7808fa525dfaaa20bd85ab05e1f44828f8c557ee15c7f2b5dd1174b1810e63 -DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19 -EBUILD zfs-0.6.0_rc13-r2.ebuild 2670 SHA256 75422b6fc4e7965f79d3f216111b4f5eee128978b2a1928b27c621a8e92c8973 SHA512 f2ad5697ae9c1f36a14952ed105153079323e911695089cf3c0ff8f0cc370598a69610d45d6edd3a95f3ff13cb855e96e9140d8e8f14561b7e34c6d64afaeee7 WHIRLPOOL 310fd967842bf67da3d8bbc05aa15b83bf180c8ef6eba39ea8a3ccb1f0679972874291dcd7d6bf7b51e2c02e544bd91bfd6c050965d962e7c6d698f87914aa20 -EBUILD zfs-0.6.0_rc14-r1.ebuild 2801 SHA256 6b344e1c08e713ee786002026c5f6cbee1bdf62f93d698e63787e7c55275db30 SHA512 c0cb816ead51e183bcd2ec7cb4469c6df5b5e68fa7e9ac707ea4863f10631cc096a14a755dc2824b4e4ea42a1ca9a7c506adde7044ed8bea1113118a077b46ba WHIRLPOOL 42c5c48c6f5a766284e4421ba221f60e229938dba0b2fc2223317561eee5ce7c20655a96c12b629294da44604b46a26f88d02e4dfe062994bdb238a7668fbdb6 -EBUILD zfs-0.6.1-r4.ebuild 3641 SHA256 910501827f7b83d612b23edcd3a18e6df4b9b8148c41cc0dbd7e94837b648df2 SHA512 70d9166defdcf8a08f8000df8cf08a4364fd4f331ce55cfe2bab51a5c8da9e3eee538019ec42abea9d8b72fa4a4602f5cd56a96b8b3b4838ebb79b6ee17644c5 WHIRLPOOL 81149281afaf43abdb577048df9b3c21af86179bb01f7865d3acea362d758396e0507131950ce0e97d753d40913d8c6a9940521fcb5eb1783bc76b6c4361cdbd -EBUILD zfs-0.6.2-r5.ebuild 3581 SHA256 21705e7d5b7de5ae5c407bd4a3e5866d101977393f5ab65000b28a16e260a015 SHA512 2d1095a074e3659409b96902df7115e056a7650db5d82bced6cfc873bd88cbf5315395706a9f6eebc63ff2001df1ad4606340f1a49500199bc41b794b8a26841 WHIRLPOOL e0c445c8f4532792988695b09f0ea1602d2f09ee36abd1ddffa8cfd8ecf0177c08f0a3e0a326e346325a2a4ff7534bbeb23d0c572e7d4a357118e269e36e0684 -EBUILD zfs-0.6.3-r2.ebuild 3458 SHA256 7d2b9180a6180bc502b586dfc521a9b6bdcd100240c3e9b13d94b894c4aae5fa SHA512 3217775779d3c1c2bc08c91ade2553b904d617158f04a877b71af25821493e358a8543a80cd8d5a26b2c767c27ec92cbd6d3974ea588d775a8b3a748182f4aa3 WHIRLPOOL 1cfc668dea3e4789bab1ee1a88d675d2541c14fb5fee7ef608ca1982948fdeedfd6e0c6103db3418e2b65684dfa3385b0f33af9e3f029e26ccfec763d5a2a273 -EBUILD zfs-0.6.4.2.ebuild 3271 SHA256 6622f1357ddc7af7a6964dc409ac129d9edb48d84d022331bc383ef0778c6fea SHA512 a9f7663390a692fd7ae8d4ca2963dffa3481cf566a267c26b7107223c17f966546b388f85c5aefb7fba9ae432565f7358426c0c73f46b5161913d6219963a31f WHIRLPOOL a363bf1364b937c59d880a2440bc671acd73ed354336ae0c43f388cd2e5f277a4f7136919562862bc651712dcb83150b0b843e41600099578f6732ab399881fc -EBUILD zfs-0.6.5.10.ebuild 5534 SHA256 3d7b1890b009d8216c51623b7c0ad6ca46fa40bbfe9af537634c673d265b26e3 SHA512 641338ba22fa87e8725b89b508b3f5e1ae492a4e715eaaf506e07f0a6fc3cee14fdc1e8502ea8f619cddb57ee0dba1a0d6112161f8bfd216a44533c6e78678f7 WHIRLPOOL 20a7f40e9363c7c3e15bbc8599fc66e8e76bb6c5ca49f58b50e8b5c70de08934e8564313fd4ade69d1da79042459fab364d1cd89134a450f76346f0e96631155 -EBUILD zfs-0.6.5.11.ebuild 5534 SHA256 3d7b1890b009d8216c51623b7c0ad6ca46fa40bbfe9af537634c673d265b26e3 SHA512 641338ba22fa87e8725b89b508b3f5e1ae492a4e715eaaf506e07f0a6fc3cee14fdc1e8502ea8f619cddb57ee0dba1a0d6112161f8bfd216a44533c6e78678f7 WHIRLPOOL 20a7f40e9363c7c3e15bbc8599fc66e8e76bb6c5ca49f58b50e8b5c70de08934e8564313fd4ade69d1da79042459fab364d1cd89134a450f76346f0e96631155 -EBUILD zfs-0.6.5.2-r1.ebuild 5749 SHA256 1d0933677bae0826dfec85b41a9ca3ad72398960b85a6931e6412c9095723476 SHA512 22aaa885d5a5987e7f998126fd1a1ef41ad507c0c928fe9f13bb217da746e2e02db93bbaf4484c287ae26c566e6125263bfd2ac99bb2b5026511a718fb3c4e85 WHIRLPOOL d713f0bbb72855ca516c6051b1ffc7ee19dd0353a758e704beb312c77b00f4289ea86fd09f2049e762f4fead14d268ccd3504b58121d1648f2c79d06d7573c3b -EBUILD zfs-0.6.5.3-r1.ebuild 6516 SHA256 30d539bd7049180992abc74873cc505d0074819ceac1b91fa653397fd77dc5c7 SHA512 eb88429f61fb4abd7bf6a22afa6102fc9ea22a586e485d804e4cb644ed46d9ae8a9ed1e0c577b2ce92829156d1b35f35e7990d89f48e3eef41aaa28ab30d5965 WHIRLPOOL 43a9bed88640a252fc6e943d8b3c13d47a2fd20066299b3e24f537b0a83e09a7362f13616e0eb6a2813681345692a88a20c83a16d1db25d7e8ddc29801d26956 -EBUILD zfs-0.6.5.3-r3.ebuild 6590 SHA256 4bf1283af92f29820c5cbfd983780337bed3985c0611a113fe4a1d75fc1ad4e5 SHA512 d978859ded763c841ebf302091b8cfebecb991bd5ce14da1e38e10bbd2a920d4d2ed2c7840485296d2c2f6a4e9129cc8d2f2601200d49a50d12e4a813e45d703 WHIRLPOOL bf21d2e57194d88c2e62d5a6b825428c932df786f01dfabba2c8eab6be1c995800d57bbb18fa3f1a29e9c77ad104b5ea86b88bd19fdfa7a12a9ca5d65c0e44b2 -EBUILD zfs-0.6.5.3-r4.ebuild 6590 SHA256 fabbb511571c5ca1ca7e88d821d9b09dcd9517b9b12232d0b5c4b9b97ed61ee6 SHA512 6c7816e8818f6e946b11045b34036ac7e5e935dd1a510ac440c16c2ee06bfa65f0f269cc3edbaf4890c01c2714f285181242a020950c0e3e872085de7e1b1cc7 WHIRLPOOL a89abc68c9b6eaa34e773b103b04a5ed9f025cb08bf447e1c10267fe8e4489fdccee757a09402ea978f25cd0b2b372bfea7664332c04b0e3827ced54385f5449 -EBUILD zfs-0.6.5.3-r5.ebuild 6605 SHA256 79bb5d013b056103478f583172f568808a5815995f73278e13b23b916baf1edc SHA512 b47633119b68479d75cd10c02bbdb6cae8af69632dcf9b288dbba9c1296dce2ed875584e4a48706242eacb8f8d5e8f4a1fee0ecc78b560c103b0fb0a77434e71 WHIRLPOOL 2badfe3dac7b04d843fd99853059c949b05f327acc2d7cfb2ca9f82247d8412a50757b441de6ac314a8ee68d400c63bcc4fb37d469822bbe1dde237bce642bc5 -EBUILD zfs-0.6.5.3.ebuild 5556 SHA256 684d36984cf655d3e86c598e613e5a6e47306fba6da4dda2a986b66b43b0f7e0 SHA512 466efa8cdecc9140a7f1a37d6d33b132b5118c1ee98659120c888ca600b36aa0044518c52f9fb577a860b5356502b02df623bde7650ba485319e70bcd94b3685 WHIRLPOOL aa1a2a1cf1ae2b48b94379fdbad85a7cedc490a18134a6cb7d2e81810b7e69ed5fb2c09d870bcff141f826fbe51ff32b56f84887ce07a3e9f48cbb72a977ecaf -EBUILD zfs-0.6.5.4-r1.ebuild 6596 SHA256 8fabdadcf40d372b94315098a24a9a0fc8139c9445e4dbeb87e4ac01bc22f89c SHA512 29bafb4efca64ccbc9288a9fcc2d1cfac732ce433c5abf6c206c521f47810a32a63ec752d30c52d12dae0db5c5c5e145117f654d051f765eec10e73ec4736828 WHIRLPOOL e970b2d43cb7bc69d41a8f9851d218c7cfabd736ef21502dcdd01a842608a3c91e9c06665bb924116151863d2090123b2de46b753c0a57c3c0143fb47b4f4d87 -EBUILD zfs-0.6.5.4-r2.ebuild 6596 SHA256 8fabdadcf40d372b94315098a24a9a0fc8139c9445e4dbeb87e4ac01bc22f89c SHA512 29bafb4efca64ccbc9288a9fcc2d1cfac732ce433c5abf6c206c521f47810a32a63ec752d30c52d12dae0db5c5c5e145117f654d051f765eec10e73ec4736828 WHIRLPOOL e970b2d43cb7bc69d41a8f9851d218c7cfabd736ef21502dcdd01a842608a3c91e9c06665bb924116151863d2090123b2de46b753c0a57c3c0143fb47b4f4d87 -EBUILD zfs-0.6.5.4.ebuild 5540 SHA256 bf3ee2e989a8bde4f44454bc682acf93ecb3b70026c0278c13199d38017587d0 SHA512 bb3f1f116ed4dcbead3952e8a40d14dfed0c0d72a56fa3a6be64d9411f454950bca39471b0fd3d130af9433c34f9800a9605b3453ced61e9813cf51f73dcce19 WHIRLPOOL ace654c55b20c240a3c2f6064f00d96aca20a02fe81df3e5284938b8b8c63fbbfc069e31eeb63a00bb7ffc9cdde4f529fb2713fd8847828ac435cf8c91d3c669 -EBUILD zfs-0.6.5.6.ebuild 5540 SHA256 bf3ee2e989a8bde4f44454bc682acf93ecb3b70026c0278c13199d38017587d0 SHA512 bb3f1f116ed4dcbead3952e8a40d14dfed0c0d72a56fa3a6be64d9411f454950bca39471b0fd3d130af9433c34f9800a9605b3453ced61e9813cf51f73dcce19 WHIRLPOOL ace654c55b20c240a3c2f6064f00d96aca20a02fe81df3e5284938b8b8c63fbbfc069e31eeb63a00bb7ffc9cdde4f529fb2713fd8847828ac435cf8c91d3c669 -EBUILD zfs-0.6.5.7.ebuild 5540 SHA256 bf3ee2e989a8bde4f44454bc682acf93ecb3b70026c0278c13199d38017587d0 SHA512 bb3f1f116ed4dcbead3952e8a40d14dfed0c0d72a56fa3a6be64d9411f454950bca39471b0fd3d130af9433c34f9800a9605b3453ced61e9813cf51f73dcce19 WHIRLPOOL ace654c55b20c240a3c2f6064f00d96aca20a02fe81df3e5284938b8b8c63fbbfc069e31eeb63a00bb7ffc9cdde4f529fb2713fd8847828ac435cf8c91d3c669 -EBUILD zfs-0.6.5.8-r1.ebuild 5534 SHA256 3d7b1890b009d8216c51623b7c0ad6ca46fa40bbfe9af537634c673d265b26e3 SHA512 641338ba22fa87e8725b89b508b3f5e1ae492a4e715eaaf506e07f0a6fc3cee14fdc1e8502ea8f619cddb57ee0dba1a0d6112161f8bfd216a44533c6e78678f7 WHIRLPOOL 20a7f40e9363c7c3e15bbc8599fc66e8e76bb6c5ca49f58b50e8b5c70de08934e8564313fd4ade69d1da79042459fab364d1cd89134a450f76346f0e96631155 -EBUILD zfs-0.6.5.8.ebuild 5540 SHA256 bf3ee2e989a8bde4f44454bc682acf93ecb3b70026c0278c13199d38017587d0 SHA512 bb3f1f116ed4dcbead3952e8a40d14dfed0c0d72a56fa3a6be64d9411f454950bca39471b0fd3d130af9433c34f9800a9605b3453ced61e9813cf51f73dcce19 WHIRLPOOL ace654c55b20c240a3c2f6064f00d96aca20a02fe81df3e5284938b8b8c63fbbfc069e31eeb63a00bb7ffc9cdde4f529fb2713fd8847828ac435cf8c91d3c669 -EBUILD zfs-0.6.5.9.ebuild 5534 SHA256 3d7b1890b009d8216c51623b7c0ad6ca46fa40bbfe9af537634c673d265b26e3 SHA512 641338ba22fa87e8725b89b508b3f5e1ae492a4e715eaaf506e07f0a6fc3cee14fdc1e8502ea8f619cddb57ee0dba1a0d6112161f8bfd216a44533c6e78678f7 WHIRLPOOL 20a7f40e9363c7c3e15bbc8599fc66e8e76bb6c5ca49f58b50e8b5c70de08934e8564313fd4ade69d1da79042459fab364d1cd89134a450f76346f0e96631155 -EBUILD zfs-0.7.0-r2.ebuild 5666 SHA256 227eaedd821399d1c04c45a2093e5f4befd7c5546f665381863d4478bd28f86e SHA512 57d4292cbe99bf889280e8d6096cae72d862c64d35146599ad1c8a746f7b70d58972d607128cf827a9219eb4594e8e555dd87204ee13ac4a0d8ecef8bfc7968e WHIRLPOOL d9059292f9dcdc897ae91172c3612438a8c0959096a9ac1a81a0c6dd1d4f6a7dde49392f1420b69b0ab610fd5d92f7ef8917355dc31cd942f452a46abd782ad8 -EBUILD zfs-0.7.1-r1.ebuild 5664 SHA256 b391f3b7e3854c80566c3829486b058708292c21587ede1e14421f83f68cd12d SHA512 bceacbfac5efce785f90d68b3ea35bc3e44e5b7561684d1157842047dd878ae50f43222b473989a4c71380e362b919baf7eba77c28cdfe4bb9c63e425a7e55b9 WHIRLPOOL e22b229a4455e73efc91daffea8184f9976942df17eb74027e65966f57c2df70df537cfe714b0ca83f375f0f43b102e5a34f59baca79009ad8d9f215e35fced0 -EBUILD zfs-0.7.2.ebuild 5664 SHA256 b391f3b7e3854c80566c3829486b058708292c21587ede1e14421f83f68cd12d SHA512 bceacbfac5efce785f90d68b3ea35bc3e44e5b7561684d1157842047dd878ae50f43222b473989a4c71380e362b919baf7eba77c28cdfe4bb9c63e425a7e55b9 WHIRLPOOL e22b229a4455e73efc91daffea8184f9976942df17eb74027e65966f57c2df70df537cfe714b0ca83f375f0f43b102e5a34f59baca79009ad8d9f215e35fced0 +EBUILD zfs-0.6.5.11.ebuild 5645 SHA256 a9dd4e6cdcf45a525a931a70d71e5611dc22f6e50fdf5fc400793fd1afdca6fb SHA512 e9b3e733902d0391a2995b8b41a0ece24d3b66dcde640d08e3365af8385ff82a4cc4c9e0114a9ab9a4d6724b282232bb342090ed2aa402233ea0b9c8fccf19c8 WHIRLPOOL 0382eb21577f741bf7d1ef8dede0add3e4d521d26b270ea8622cac674f10042e99cf47d730e74c9408c8403aa87449f14c48f79fcec5a0f5c6c3cb924ac84945 +EBUILD zfs-0.6.5.4-r2.ebuild 6707 SHA256 dbddd1b695a5a5e64c7924b070ff906aba4d60021d43d298917dc06d190cf933 SHA512 8fc59acfb83b6e049bcc526f015315247a2450585c030a6ad9636cdbaececeb0def8adfd89087a3d270cc09a79f0d20b610db5de2386c5b72d70db6980b69150 WHIRLPOOL a3258c11af3de84ee686b9490d982372787e3ad27d75b41dae752b33379d7eee16cae08702f009237e9c17b33ad1d88d552ac9b8710bd1c6d8c9acba3cc84859 EBUILD zfs-0.7.3.ebuild 5664 SHA256 b391f3b7e3854c80566c3829486b058708292c21587ede1e14421f83f68cd12d SHA512 bceacbfac5efce785f90d68b3ea35bc3e44e5b7561684d1157842047dd878ae50f43222b473989a4c71380e362b919baf7eba77c28cdfe4bb9c63e425a7e55b9 WHIRLPOOL e22b229a4455e73efc91daffea8184f9976942df17eb74027e65966f57c2df70df537cfe714b0ca83f375f0f43b102e5a34f59baca79009ad8d9f215e35fced0 EBUILD zfs-9999.ebuild 5805 SHA256 eaf5b0d4c9c3b4b104a186c37040d0653759726ea3863801a5fb376cc154d67c SHA512 3fd1ac15bd72bc98dff861e7860f83d63727aeafa9a35c3d355df9deb4c40009206f18d09794fd26f1fe9702238098452a8ab6fb67d84a5ac84be5776ad10f7a WHIRLPOOL 2d3107fc13230a9e55cf2b74eedf799070d70e82eea687260849568ed091f5674e3fc4abbb9df347a04d68684733bb04d99a5e284aa77b702b6a6c1548917e3e MISC ChangeLog 13217 SHA256 9c37690b8a7b7c6a33139009109f582ca82bf3e6c8684c7ba5aad6c1217ee18c SHA512 9ec9c5ae1b4de72eb4b54d4ca9b5e15efcbbf47a87e9c2456656f25a0ed67258e135cd7bba6cbffc2ada994d6ff86d313449c79fcf1843a994808bac57b12546 WHIRLPOOL 270399247f437617eb0ac51bdb0c4d11e97bb894e6166066c8ba8aaa5e84e8aa3684fae19682d6a7e7d7e970199ed0d3025db6fcea2aa7df5e839dc89ccc6923 diff --git a/sys-fs/zfs/files/bash-completion b/sys-fs/zfs/files/bash-completion deleted file mode 100644 index 1b9428bf8602..000000000000 --- a/sys-fs/zfs/files/bash-completion +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright (c) 2010, Aneurin Price <aneurin.price@gmail.com> - -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following -# conditions: - -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. - -__zfs_get_commands() -{ - zfs 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq -} - -__zfs_get_properties() -{ - zfs get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all -} - -__zfs_get_editable_properties() -{ - zfs get 2>&1 | awk '$2 == "YES" {printf("%s=\n", $1)}' -} - -__zfs_get_inheritable_properties() -{ - zfs get 2>&1 | awk '$3 == "YES" {print $1}' -} - -__zfs_list_datasets() -{ - zfs list -H -o name -} - -__zfs_list_filesystems() -{ - zfs list -H -o name -t filesystem -} - -__zfs_list_snapshots() -{ - zfs list -H -o name -t snapshot -} - -__zfs_list_volumes() -{ - zfs list -H -o name -t volume -} - -__zfs_argument_chosen() -{ - for word in $(seq $((COMP_CWORD-1)) -1 2) - do - local prev="${COMP_WORDS[$word]}" - for property in $@ - do - if [ "x$prev" = "x$property" ] - then - return 0 - fi - done - done - return 1 -} - -__zfs_complete_ordered_arguments() -{ - local list1=$1 - local list2=$2 - local cur=$3 - local extra=$4 - if __zfs_argument_chosen $list1 - then - COMPREPLY=($(compgen -W "$list2 $extra" -- "$cur")) - else - COMPREPLY=($(compgen -W "$list1 $extra" -- "$cur")) - fi -} - -__zfs_complete() -{ - local cur prev cmd cmds - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - cmd="${COMP_WORDS[1]}" - cmds=$(__zfs_get_commands) - - if [ "${prev##*/}" = "zfs" ] - then - COMPREPLY=($(compgen -W "$cmds -?" -- "$cur")) - return 0 - fi - - case "${cmd}" in - clone) - __zfs_complete_ordered_arguments "$(__zfs_list_snapshots)" "$(__zfs_list_filesystems) $(__zfs_list_volumes)" $cur - return 0 - ;; - get) - __zfs_complete_ordered_arguments "$(__zfs_get_properties)" "$(__zfs_list_datasets)" "$cur" "-H -r -p" - return 0 - ;; - inherit) - __zfs_complete_ordered_arguments "$(__zfs_get_inheritable_properties)" "$(__zfs_list_datasets)" $cur - return 0 - ;; - list) - if [ "x$prev" = "x-o" ] - then - COMPREPLY=($(compgen -W "$(__zfs_get_properties)" -- "${cur##*,}")) - local existing_opts=$(expr "$cur" : '\(.*,\)') - if [ ! "x$existing_opts" = "x" ] - then - COMPREPLY=( "${COMPREPLY[@]/#/${existing_opts}}" ) - fi - else - COMPREPLY=($(compgen -W "$(__zfs_list_datasets) -H -r -o" -- "$cur")) - fi - return 0 - ;; - promote) - COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur")) - return 0 - ;; - rollback|send) - COMPREPLY=($(compgen -W "$(__zfs_list_snapshots)" -- "$cur")) - return 0 - ;; - snapshot) - COMPREPLY=($(compgen -W "$(__zfs_list_filesystems) $(__zfs_list_volumes)" -- "$cur")) - return 0 - ;; - set) - __zfs_complete_ordered_arguments "$(__zfs_get_editable_properties)" "$(__zfs_list_filesystems) $(__zfs_list_volumes)" $cur - return 0 - ;; - *) - COMPREPLY=($(compgen -W "$(__zfs_list_datasets)" -- "$cur")) - return 0 - ;; - esac - -} - -__zpool_get_commands() -{ - zpool 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq -} - -__zpool_get_properties() -{ - zpool get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all -} - -__zpool_get_editable_properties() -{ - zpool get 2>&1 | awk '$2 == "YES" {printf("%s=\n", $1)}' -} - -__zpool_list_pools() -{ - zpool list -H -o name -} - -__zpool_complete() -{ - local cur prev cmd cmds - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - cmd="${COMP_WORDS[1]}" - cmds=$(__zpool_get_commands) - - if [ "${prev##*/}" = "zpool" ] - then - COMPREPLY=($(compgen -W "$cmds" -- "$cur")) - return 0 - fi - - case "${cmd}" in - get) - __zfs_complete_ordered_arguments "$(__zpool_get_properties)" "$(__zpool_list_pools)" $cur - return 0 - ;; - import) - if [ "x$prev" = "x-d" ] - then - _filedir -d - else - COMPREPLY=($(compgen -W "$(__zpool_list_pools) -d" -- "$cur")) - fi - return 0 - ;; - set) - __zfs_complete_ordered_arguments "$(__zpool_get_editable_properties)" "$(__zpool_list_pools)" $cur - return 0 - ;; - add|attach|clear|create|detach|offline|online|remove|replace) - local pools="$(__zpool_list_pools)" - if __zfs_argument_chosen $pools - then - _filedir - else - COMPREPLY=($(compgen -W "$pools" -- "$cur")) - fi - return 0 - ;; - *) - COMPREPLY=($(compgen -W "$(__zpool_list_pools)" -- "$cur")) - return 0 - ;; - esac - -} - -complete -F __zfs_complete zfs -complete -o filenames -F __zpool_complete zpool diff --git a/sys-fs/zfs/files/zed b/sys-fs/zfs/files/zed deleted file mode 100644 index d46acfacb4a3..000000000000 --- a/sys-fs/zfs/files/zed +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need zfs -} - -start() { - ebegin "Starting ZFS Event daemon" - - checkpath -q -d -m 0755 /var/run/zed - - start-stop-daemon --start -q \ - --exec /sbin/zed -- -M \ - -p /var/run/zed/pid - eend $? - -} - -stop() { -ebegin "Stopping ZFS Event daemon" - start-stop-daemon --stop -q --pidfile /var/run/zed/pid -eend $? -} diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch b/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch deleted file mode 100644 index b493424a1e77..000000000000 --- a/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 399f60c8b47f7513d078a7c181ff132e2cafdd15 Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@cs.stonybrook.edu> -Date: Tue, 5 Feb 2013 18:14:30 -0500 -Subject: [PATCH] Fix function relocations in libzpool - -binutils 2.23.1 fails in situations that generate function relocations -on PowerPC and possibly other architectures. This causes linking of -libzpool to fail because it depends on libnvpair. We add a dependency on -libnvpair to lib/libzpool/Makefile.am to correct that. - -Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1267 ---- - lib/libzpool/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am -index 3e62de6..cbba388 100644 ---- a/lib/libzpool/Makefile.am -+++ b/lib/libzpool/Makefile.am -@@ -94,7 +94,8 @@ libzpool_la_SOURCES = \ - - libzpool_la_LIBADD = \ - $(top_builddir)/lib/libunicode/libunicode.la \ -- $(top_builddir)/lib/libuutil/libuutil.la -+ $(top_builddir)/lib/libuutil/libuutil.la \ -+ $(top_builddir)/lib/libnvpair/libnvpair.la - - libzpool_la_LDFLAGS = -pthread -version-info 1:1:0 - --- -1.7.10 - diff --git a/sys-fs/zfs/files/zfs-0.6.1-avoid-zdb-abort.patch b/sys-fs/zfs/files/zfs-0.6.1-avoid-zdb-abort.patch deleted file mode 100644 index f73840feeed6..000000000000 --- a/sys-fs/zfs/files/zfs-0.6.1-avoid-zdb-abort.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5d3dc3fb72518a4c191e3a014622b74365eb3a74 Mon Sep 17 00:00:00 2001 -From: Mike Leddy <mike.leddy@gmail.com> -Date: Thu, 4 Jul 2013 01:02:05 -0300 -Subject: [PATCH] Avoid abort() in vn_rdwr(): libzpool/kernel.c - -Make sure that buffer is aligned to 512 bytes on linux so that -pread call combined with O_DIRECT does not return EINVAL. - -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1570 ---- - cmd/zdb/zdb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c -index 936974b..a2b6bfe 100644 ---- a/cmd/zdb/zdb.c -+++ b/cmd/zdb/zdb.c -@@ -2844,7 +2844,7 @@ - psize = size; - lsize = size; - -- pbuf = umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL); -+ pbuf = umem_alloc_aligned(SPA_MAXBLOCKSIZE, 512, UMEM_NOFAIL); - lbuf = umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL); - - BP_ZERO(bp); --- -1.8.1.6 - diff --git a/sys-fs/zfs/files/zfs-0.6.1-fix-gcc-4.8-warning.patch b/sys-fs/zfs/files/zfs-0.6.1-fix-gcc-4.8-warning.patch deleted file mode 100644 index 00ec1057efa1..000000000000 --- a/sys-fs/zfs/files/zfs-0.6.1-fix-gcc-4.8-warning.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3db3ff4a787acf068b122562fb5be5aecec2611f Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@gentoo.org> -Date: Tue, 2 Jul 2013 00:07:15 -0400 -Subject: [PATCH] Use MAXPATHLEN instead of sizeof in snprintf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This silences a GCC 4.8.0 warning by fixing a programming error -caught by static analysis: - -../../cmd/ztest/ztest.c: In function ‘ztest_vdev_aux_add_remove’: -../../cmd/ztest/ztest.c:2584:33: error: argument to ‘sizeof’ - in ‘snprintf’ call is the same expression as the destination; - did you mean to provide an explicit length? - [-Werror=sizeof-pointer-memaccess] - (void) snprintf(path, sizeof (path), ztest_aux_template, - ^ - -Signed-off-by: Richard Yao <ryao@gentoo.org> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #1480 ---- - cmd/ztest/ztest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c -index b38d7b1..93a5f1e 100644 ---- a/cmd/ztest/ztest.c -+++ b/cmd/ztest/ztest.c -@@ -2581,7 +2581,7 @@ enum ztest_object { - zs->zs_vdev_aux = 0; - for (;;) { - int c; -- (void) snprintf(path, sizeof (path), ztest_aux_template, -+ (void) snprintf(path, MAXPATHLEN, ztest_aux_template, - ztest_opts.zo_dir, ztest_opts.zo_pool, aux, - zs->zs_vdev_aux); - for (c = 0; c < sav->sav_count; c++) --- -1.8.1.6 - diff --git a/sys-fs/zfs/files/zfs-0.6.1-fix-zvol-initialization-r1.patch b/sys-fs/zfs/files/zfs-0.6.1-fix-zvol-initialization-r1.patch deleted file mode 100644 index b1e7d3736db0..000000000000 --- a/sys-fs/zfs/files/zfs-0.6.1-fix-zvol-initialization-r1.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff --git a/module/zfs/spa.c b/module/zfs/spa.c -index e986e92..65f78b7 100644 ---- a/module/zfs/spa.c -+++ b/module/zfs/spa.c -@@ -64,6 +64,7 @@ - #include <sys/zfs_ioctl.h> - #include <sys/dsl_scan.h> - #include <sys/zfeature.h> -+#include <sys/zvol.h> - - #ifdef _KERNEL - #include <sys/bootprops.h> -@@ -2856,6 +2857,7 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy, - spa_load_state_t state = SPA_LOAD_OPEN; - int error; - int locked = B_FALSE; -+ int firstopen = B_FALSE; - - *spapp = NULL; - -@@ -2879,6 +2881,8 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy, - if (spa->spa_state == POOL_STATE_UNINITIALIZED) { - zpool_rewind_policy_t policy; - -+ firstopen = B_TRUE; -+ - zpool_get_rewind_policy(nvpolicy ? nvpolicy : spa->spa_config, - &policy); - if (policy.zrp_request & ZPOOL_DO_REWIND) -@@ -2953,6 +2957,11 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy, - mutex_exit(&spa_namespace_lock); - } - -+#ifdef _KERNEL -+ if (firstopen) -+ zvol_create_minors(spa->spa_name); -+#endif -+ - *spapp = spa; - - return (0); -@@ -4010,6 +4019,10 @@ spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags) - mutex_exit(&spa_namespace_lock); - spa_history_log_version(spa, LOG_POOL_IMPORT); - -+#ifdef _KERNEL -+ zvol_create_minors(pool); -+#endif -+ - return (0); - } - -diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c -index 1226b2c..a9184a1 100644 ---- a/module/zfs/zfs_ioctl.c -+++ b/module/zfs/zfs_ioctl.c -@@ -1268,9 +1268,6 @@ zfs_ioc_pool_import(zfs_cmd_t *zc) - error = err; - } - -- if (error == 0) -- zvol_create_minors(zc->zc_name); -- - nvlist_free(config); - - if (props) -diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c -index 43a7bb6..e35c91b 100644 ---- a/module/zfs/zvol.c -+++ b/module/zfs/zvol.c -@@ -1215,6 +1215,9 @@ zvol_alloc(dev_t dev, const char *name) - - zv = kmem_zalloc(sizeof (zvol_state_t), KM_SLEEP); - -+ spin_lock_init(&zv->zv_lock); -+ list_link_init(&zv->zv_next); -+ - zv->zv_queue = blk_init_queue(zvol_request, &zv->zv_lock); - if (zv->zv_queue == NULL) - goto out_kmem; -@@ -1248,9 +1251,6 @@ zvol_alloc(dev_t dev, const char *name) - sizeof (rl_t), offsetof(rl_t, r_node)); - zv->zv_znode.z_is_zvol = TRUE; - -- spin_lock_init(&zv->zv_lock); -- list_link_init(&zv->zv_next); -- - zv->zv_disk->major = zvol_major; - zv->zv_disk->first_minor = (dev & MINORMASK); - zv->zv_disk->fops = &zvol_ops; -@@ -1561,30 +1561,36 @@ zvol_init(void) - { - int error; - -+ list_create(&zvol_state_list, sizeof (zvol_state_t), -+ offsetof(zvol_state_t, zv_next)); -+ mutex_init(&zvol_state_lock, NULL, MUTEX_DEFAULT, NULL); -+ - zvol_taskq = taskq_create(ZVOL_DRIVER, zvol_threads, maxclsyspri, - zvol_threads, INT_MAX, TASKQ_PREPOPULATE); - if (zvol_taskq == NULL) { - printk(KERN_INFO "ZFS: taskq_create() failed\n"); -- return (-ENOMEM); -+ error = -ENOMEM; -+ goto out1; - } - - error = register_blkdev(zvol_major, ZVOL_DRIVER); - if (error) { - printk(KERN_INFO "ZFS: register_blkdev() failed %d\n", error); -- taskq_destroy(zvol_taskq); -- return (error); -+ goto out2; - } - - blk_register_region(MKDEV(zvol_major, 0), 1UL << MINORBITS, - THIS_MODULE, zvol_probe, NULL, NULL); - -- mutex_init(&zvol_state_lock, NULL, MUTEX_DEFAULT, NULL); -- list_create(&zvol_state_list, sizeof (zvol_state_t), -- offsetof(zvol_state_t, zv_next)); -+ return (0); - -- (void) zvol_create_minors(NULL); -+out2: -+ taskq_destroy(zvol_taskq); -+out1: -+ mutex_destroy(&zvol_state_lock); -+ list_destroy(&zvol_state_list); - -- return (0); -+ return (error); - } - - void -diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh -index 141348c..281166c 100755 ---- a/scripts/zconfig.sh -+++ b/scripts/zconfig.sh -@@ -264,8 +264,9 @@ test_4() { - zconfig_zvol_device_stat 0 ${POOL_NAME} ${FULL_ZVOL_NAME} \ - ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 9 - -- # Load the modules, wait 1 second for udev -+ # Load the modules, list the pools to ensure they are opened - ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 10 -+ ${ZPOOL} list &>/dev/null - - # Verify the devices were created - zconfig_zvol_device_stat 10 ${POOL_NAME} ${FULL_ZVOL_NAME} \ -diff --git a/udev/rules.d/90-zfs.rules.in b/udev/rules.d/90-zfs.rules.in -index 52e1d63..a2715d2 100644 ---- a/udev/rules.d/90-zfs.rules.in -+++ b/udev/rules.d/90-zfs.rules.in -@@ -1,4 +1,4 @@ --SUBSYSTEM!="block", GOTO="zfs_end" -+SUBSYSTEM!="block|misc", GOTO="zfs_end" - ACTION!="add|change", GOTO="zfs_end" - - ENV{ID_FS_TYPE}=="zfs", RUN+="/sbin/modprobe zfs" -@@ -7,4 +7,6 @@ ENV{ID_FS_TYPE}=="zfs_member", RUN+="/sbin/modprobe zfs" - KERNEL=="null", SYMLINK+="root" - SYMLINK=="null", SYMLINK+="root" - -+SUBSYSTEM=="misc", KERNEL=="zfs", RUN+="@sbindir@/zpool list" -+ - LABEL="zfs_end" diff --git a/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch b/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch deleted file mode 100644 index e794b183eb33..000000000000 --- a/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit 75c2fb953c99bba008f1ef72ee71136002749f51 -Author: Richard Yao <ryao@cs.stonybrook.edu> -Date: Tue May 28 20:08:15 2013 -0400 - - Improve OpenRC init script - - The current zfs OpenRC script's dependencies cause OpenRC to attempt to - unmount ZFS filesystems at shutdown while things were still using them, - which would fail. This is a cosmetic issue, but it should still be - addressed. It probably does not affect systems where the rootfs is a - legacy filesystem, but any system with the rootfs on ZFS needs to run - the ZFS init script after the system is ready to shutdown filesystems. - - OpenRC's shutdown process occurs in the reverse order of the startup - process. Therefore running the ZFS shutdown procedure after filesystems - are ready to be unmounted requires running the startup procedure before - fstab. This patch changes the dependencies of the script to expliclty - run before fstab at boot when the rootfs is ZFS and to run after fstab - at boot whenever the rootfs is not ZFS. This should cover most use - cases. - - The only cases not covered well by this are systems with legacy - root filesystems where people want to configure fstab to mount a non-ZFS - filesystem off a zvol and possibly also systems whose pools are stored - on network block devices. The former requires that the ZFS script run - before fstab, which could cause ZFS datasets to mount too early and - appear under the fstab mount points. The latter requires that the ZFS - script run after networking starts, which precludes the ability to store - any system information on ZFS. An additional OpenRC script could be - written to handle non-root pools on network block devices, but that will - depend on user demand and developer time. - - Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu> - -diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in -index 5b8671e..0034e02 100644 ---- a/etc/init.d/zfs.gentoo.in -+++ b/etc/init.d/zfs.gentoo.in -@@ -10,9 +10,16 @@ fi - - depend() - { -+ # Try to allow people to mix and match fstab with ZFS in a way that makes sense. -+ if [ "$(mountinfo -s /)" = 'zfs' ] -+ then -+ before localmount -+ else -+ after localmount -+ fi -+ - # bootmisc will log to /var which may be a different zfs than root. -- before net bootmisc -- after udev localmount -+ before bootmisc logger - keyword -lxc -openvz -prefix -vserver - } - diff --git a/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch b/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch deleted file mode 100644 index fec87d0123f3..000000000000 --- a/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch +++ /dev/null @@ -1,256 +0,0 @@ -commit 3cb750b249717b43cbfcde78b44b0e38a2a61dc2 -Author: James Lee <jlee@thestaticvoid.com> -Date: Sat Sep 19 22:00:36 2015 -0400 - - zfs-import: Perform verbatim import using cache file - - This change modifies the import service to use the default cache file - to perform a verbatim import of pools at boot. This fixes code that - searches all devices and imported all visible pools. - - Using the cache file is in keeping with the way ZFS has always worked, - how Solaris, Illumos, FreeBSD, and systemd performs imports, and is how - it is written in the man page (zpool(1M,8)): - - All pools in this cache are automatically imported when the - system boots. - - Importantly, the cache contains important information for importing - multipath devices, and helps control which pools get imported in more - dynamic environments like SANs, which may have thousands of visible - and constantly changing pools, which the ZFS_POOL_EXCEPTIONS variable - is not equipped to handle. Verbatim imports prevent rogue pools from - being automatically imported and mounted where they shouldn't be. - - The change also stops the service from exporting pools at shutdown. - Exporting pools is only meant to be performed explicitly by the - administrator of the system. - - The old behavior of searching and importing all visible pools is - preserved and can be switched on by heeding the warning and toggling - the ZPOOL_IMPORT_ALL_VISIBLE variable in /etc/default/zfs. - - Closes #3777 - Closes #3526 - -diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in -index 5e21929..2258638 100755 ---- a/etc/init.d/zfs-import.in -+++ b/etc/init.d/zfs-import.in -@@ -1,11 +1,10 @@ - #!@SHELL@ - # --# zfs-import This script will import/export zfs pools. -+# zfs-import This script will import ZFS pools - # - # chkconfig: 2345 01 99 --# description: This script will import/export zfs pools during system --# boot/shutdown. --# It is also responsible for all userspace zfs services. -+# description: This script will perform a verbatim import of ZFS pools -+# during system boot. - # probe: true - # - ### BEGIN INIT INFO -@@ -17,7 +16,7 @@ - # X-Start-Before: checkfs - # X-Stop-After: zfs-mount - # Short-Description: Import ZFS pools --# Description: Run the `zpool import` or `zpool export` commands. -+# Description: Run the `zpool import` command. - ### END INIT INFO - # - # NOTE: Not having '$local_fs' on Required-Start but only on Required-Stop -@@ -43,6 +42,16 @@ do_depend() - keyword -lxc -openvz -prefix -vserver - } - -+# Use the zpool cache file to import pools -+do_verbatim_import() -+{ -+ if [ -f "$ZPOOL_CACHE" ] -+ then -+ zfs_action "Importing ZFS pool(s)" \ -+ "$ZPOOL" import -c "$ZPOOL_CACHE" -N -a -+ fi -+} -+ - # Support function to get a list of all pools, separated with ';' - find_pools() - { -@@ -60,8 +69,8 @@ find_pools() - echo "${pools%%;}" # Return without the last ';'. - } - --# Import all pools --do_import() -+# Find and import all visible pools, even exported ones -+do_import_all_visible() - { - local already_imported available_pools pool npools - local exception dir ZPOOL_IMPORT_PATH RET=0 r=1 -@@ -109,7 +118,7 @@ do_import() - fi - fi - -- # Filter out any exceptions... -+ # Filter out any exceptions... - if [ -n "$ZFS_POOL_EXCEPTIONS" ] - then - local found="" -@@ -249,41 +258,15 @@ do_import() - return "$RET" - } - --# Export all pools --do_export() -+do_import() - { -- local already_imported pool root_pool RET r -- RET=0 -- -- root_pool=$(get_root_pool) -- -- [ -n "$init" ] && zfs_log_begin_msg "Exporting ZFS pool(s)" -- -- # Find list of already imported pools. -- already_imported=$(find_pools "$ZPOOL" list -H -oname) -- -- OLD_IFS="$IFS" ; IFS=";" -- for pool in $already_imported; do -- [ "$pool" = "$root_pool" ] && continue -- -- if [ -z "$init" ] -- then -- # Interactive - one 'Importing ...' line per pool -- zfs_log_begin_msg "Exporting ZFS pool $pool" -- else -- # Not interactive - a dot for each pool. -- zfs_log_progress_msg "." -- fi -- -- "$ZPOOL" export "$pool" -- r="$?" ; RET=$((RET + r)) -- [ -z "$init" ] && zfs_log_end_msg "$r" -- done -- IFS="$OLD_IFS" -- -- [ -n "$init" ] && zfs_log_end_msg "$RET" -- -- return "$RET" -+ if check_boolean "$ZPOOL_IMPORT_ALL_VISIBLE" -+ then -+ do_import_all_visible -+ else -+ # This is the default option -+ do_verbatim_import -+ fi - } - - # Output the status and list of pools -@@ -323,14 +306,6 @@ do_start() - fi - } - --do_stop() --{ -- # Check to see if the module is even loaded. -- check_module_loaded "zfs" || exit 0 -- -- do_export --} -- - # ---------------------------------------------------- - - if [ ! -e /etc/gentoo-release ] -@@ -340,7 +315,7 @@ then - do_start - ;; - stop) -- do_stop -+ # no-op - ;; - status) - do_status -@@ -350,7 +325,7 @@ then - ;; - *) - [ -n "$1" ] && echo "Error: Unknown command $1." -- echo "Usage: $0 {start|stop|status}" -+ echo "Usage: $0 {start|status}" - exit 3 - ;; - esac -@@ -360,6 +335,5 @@ else - # Create wrapper functions since Gentoo don't use the case part. - depend() { do_depend; } - start() { do_start; } -- stop() { do_stop; } - status() { do_status; } - fi -diff --git a/etc/init.d/zfs.in b/etc/init.d/zfs.in -index eabb7e4..d81ef22 100644 ---- a/etc/init.d/zfs.in -+++ b/etc/init.d/zfs.in -@@ -16,6 +16,24 @@ ZFS_SHARE='yes' - # Run `zfs unshare -a` during system stop? - ZFS_UNSHARE='yes' - -+# By default, a verbatim import of all pools is performed at boot based on the -+# contents of the default zpool cache file. The contents of the cache are -+# managed automatically by the 'zpool import' and 'zpool export' commands. -+# -+# By setting this to 'yes', the system will instead search all devices for -+# pools and attempt to import them all at boot, even those that have been -+# exported. Under this mode, the search path can be controlled by the -+# ZPOOL_IMPORT_PATH variable and a list of pools that should not be imported -+# can be listed in the ZFS_POOL_EXCEPTIONS variable. -+# -+# Note that importing all visible pools may include pools that you don't -+# expect, such as those on removable devices and SANs, and those pools may -+# proceed to mount themselves in places you do not want them to. The results -+# can be unpredictable and possibly dangerous. Only enable this option if you -+# understand this risk and have complete physical control over your system and -+# SAN to prevent the insertion of malicious pools. -+ZPOOL_IMPORT_ALL_VISIBLE='no' -+ - # Specify specific path(s) to look for device nodes and/or links for the - # pool import(s). See zpool(8) for more information about this variable. - # It supersedes the old USE_DISK_BY_ID which indicated that it would only -@@ -23,6 +41,18 @@ ZFS_UNSHARE='yes' - # The old variable will still work in the code, but is deprecated. - #ZPOOL_IMPORT_PATH="/dev/disk/by-vdev:/dev/disk/by-id" - -+# List of pools that should NOT be imported at boot -+# when ZPOOL_IMPORT_ALL_VISIBLE is 'yes'. -+# This is a space separated list. -+#ZFS_POOL_EXCEPTIONS="test2" -+ -+# List of pools that SHOULD be imported at boot by the initramfs -+# instead of trying to import all available pools. If this is set -+# then ZFS_POOL_EXCEPTIONS is ignored. -+# Only applicable for Debian GNU/Linux {dkms,initramfs}. -+# This is a semi-colon separated list. -+#ZFS_POOL_IMPORT="pool1;pool2" -+ - # Should the datasets be mounted verbosely? - # A mount counter will be used when mounting if set to 'yes'. - VERBOSE_MOUNT='no' -@@ -97,17 +127,6 @@ ZFS_INITRD_POST_MODPROBE_SLEEP='0' - # Example: If root FS is 'rpool/ROOT/rootfs', this would make sense. - #ZFS_INITRD_ADDITIONAL_DATASETS="rpool/ROOT/usr rpool/ROOT/var" - --# List of pools that should NOT be imported at boot? --# This is a space separated list. --#ZFS_POOL_EXCEPTIONS="test2" -- --# List of pools to import? --# If this variable is set, there will be NO auto-import of ANY other --# pool. In essence, there will be no auto detection of availible pools. --# This is a semi-colon separated list. --# Makes the variable ZFS_POOL_EXCEPTIONS above redundant (won't be checked). --#ZFS_POOL_IMPORT="pool1;pool2" -- - # Optional arguments for the ZFS Event Daemon (ZED). - # See zed(8) for more information on available options. - #ZED_ARGS="-M" diff --git a/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild deleted file mode 100644 index e545cac769a8..000000000000 --- a/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-2 linux-mod - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - ) -" - -pkg_setup() { - : -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs - rm -rf "${ED}usr/share/dracut" - use test-suite || rm -rf "${ED}usr/libexec" - - newbashcomp "${FILESDIR}/bash-completion" zfs - -} - -pkg_postinst() { - - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ - || ewarn 'You should add zfs to the boot runlevel.' - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild deleted file mode 100644 index 3c1aed0df31b..000000000000 --- a/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-2 linux-mod - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) -" - -pkg_setup() { - : -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - if [ ${PV} != "9999" ] - then - epatch "${FILESDIR}/${P}-fix-libzpool-function-relocations.patch" - fi - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs - rm -rf "${ED}usr/share/dracut" - use test-suite || rm -rf "${ED}usr/libexec" - - newbashcomp "${FILESDIR}/bash-completion" zfs - -} - -pkg_postinst() { - - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ - || ewarn 'You should add zfs to the boot runlevel.' - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.1-r4.ebuild b/sys-fs/zfs/zfs-0.6.1-r4.ebuild deleted file mode 100644 index 2ac499a40822..000000000000 --- a/sys-fs/zfs/zfs-0.6.1-r4.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-2 linux-mod - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - selinux? ( sys-libs/libselinux ) - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) -" - -pkg_setup() { - : -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Fix OpenRC dependencies - epatch "${FILESDIR}/${P}-gentoo-openrc-dependencies.patch" - - # Make zvol initialization asynchronous - epatch "${FILESDIR}/${P}-fix-zvol-initialization-r1.patch" - - # Use MAXPATHLEN to silence GCC 4.8 warning - epatch "${FILESDIR}/${P}-fix-gcc-4.8-warning.patch" - - # Avoid zdb abort - epatch "${FILESDIR}/${P}-avoid-zdb-abort.patch" - fi - - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - $(use_with selinux) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs - rm -rf "${ED}usr/lib/dracut" - use test-suite || rm -rf "${ED}usr/share/zfs" - - use bash-completion && newbashcomp "${FILESDIR}/bash-completion" zfs - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ - || ewarn 'You should add zfs to the boot runlevel.' - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.2-r5.ebuild b/sys-fs/zfs/zfs-0.6.2-r5.ebuild deleted file mode 100644 index fa129ce86dbb..000000000000 --- a/sys-fs/zfs/zfs-0.6.2-r5.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit python-r1 - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-2 linux-mod - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz - https://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p4.tar.xz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL bash-completion? ( MIT )" -SLOT="0" -IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs selinux test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - selinux? ( sys-libs/libselinux ) - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) -" - -pkg_setup() { - : -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches" - fi - - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - $(use_with selinux) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs - rm -rf "${ED}usr/lib/dracut" - use test-suite || rm -rf "${ED}usr/share/zfs" - - use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ - || ewarn 'You should add zfs to the boot runlevel.' - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.3-r2.ebuild b/sys-fs/zfs/zfs-0.6.3-r2.ebuild deleted file mode 100644 index 08afee227fbe..000000000000 --- a/sys-fs/zfs/zfs-0.6.3-r2.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit python-r1 - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-2 linux-mod - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - inherit eutils versionator - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz - https://dev.gentoo.org/~ryao/dist/${P}-patches-r1.tar.xz" - S="${WORKDIR}/${PN}-${P}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL bash-completion? ( MIT )" -SLOT="0" -IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) -" - -pkg_setup() { - : -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${P}-patches" - fi - -# Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ - || ewarn 'You should add zfs to the boot runlevel.' - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.4.2.ebuild b/sys-fs/zfs/zfs-0.6.4.2.ebuild deleted file mode 100644 index ad8286b39e3d..000000000000 --- a/sys-fs/zfs/zfs-0.6.4.2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit python-r1 - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-2 linux-mod - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - inherit eutils versionator - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL bash-completion? ( MIT )" -SLOT="0" -IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) -" - -pkg_setup() { - : -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - rm -rf "${ED}usr/lib/dracut" - use test-suite || rm -rf "${ED}usr/share/zfs" - - use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" - doinitd "${FILESDIR}/zed" -} - -pkg_postinst() { - - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ - || ewarn 'You should add zfs to the boot runlevel.' - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.10.ebuild b/sys-fs/zfs/zfs-0.6.5.10.ebuild deleted file mode 100644 index 535d86509fdf..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.10.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - sys-fs/udev-init-scripts -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.11.ebuild b/sys-fs/zfs/zfs-0.6.5.11.ebuild index 535d86509fdf..9d6cba3ac805 100644 --- a/sys-fs/zfs/zfs-0.6.5.11.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.11.ebuild @@ -32,7 +32,10 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " +# Adding glibc >= 2.25 blocker for ZFS versions lower +# than 0.7.0, due to bug 617628. RDEPEND="${COMMON_DEPEND} + !>=sys-libs/glibc-2.25 !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) !sys-fs/zfs-fuse diff --git a/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild deleted file mode 100644 index b202c6dc5ffd..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit python-r1 linux-info - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-2 linux-mod - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - inherit eutils versionator - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL bash-completion? ( MIT )" -SLOT="0" -IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { -if [ ${PV} != "9999" ] - then - # Fix OpenRC scripts - epatch "${FILESDIR}/zfs-0.6.5-fix-openrc-scripts.patch" - fi - - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.3-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r1.ebuild deleted file mode 100644 index bff26ccbf7da..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.3-r1.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz - https://dev.gentoo.org/~ryao/dist/${P}-patches-p0.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( - =sys-fs/zfs-kmod-${PV}* - !<sys-fs/zfs-kmod-0.6.5.3-r1 - ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${P}-patches" - fi - - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - - einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and " - einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable " - einfo "/dev/zfs API developed by ClusterHQ. This means that situations " - einfo "arising from the kernel modules and userland tools being " - einfo "mismatched on future updates will not cause problems." - einfo - einfo "In specific, this should solve the failure to mount filesystems when " - einfo "old modules are cached in an old initramfs provided that those " - einfo "modules support this API" - if use rootfs - then - einfo - ewarn "The older modules will *NOT* work with the new userland code." - ewarn "It is very important that you update your initramfs after this " - ewarn "update." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.3-r3.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r3.ebuild deleted file mode 100644 index 5738ad4a5d9e..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.3-r3.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz - https://dev.gentoo.org/~ryao/dist/${P}-patches-p2.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( - =sys-fs/zfs-kmod-${PV}* - !<sys-fs/zfs-kmod-0.6.5.3-r1 - ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${P}-patches" - fi - - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - - einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and " - einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable " - einfo "/dev/zfs API developed by ClusterHQ. This means that situations " - einfo "arising from the kernel modules and userland tools being " - einfo "mismatched on future updates will not cause problems." - einfo - einfo "In specific, this should solve the failure to mount filesystems when " - einfo "old modules are cached in an old initramfs provided that those " - einfo "modules support this API" - if use rootfs - then - einfo - ewarn "The older modules will *NOT* work with the new userland code." - ewarn "It is very important that you update your initramfs after this " - ewarn "update." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.3-r4.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r4.ebuild deleted file mode 100644 index 7e7b6f6cd9d4..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.3-r4.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz - https://dev.gentoo.org/~ryao/dist/${P}-patches-p3.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( - =sys-fs/zfs-kmod-${PV}* - !<sys-fs/zfs-kmod-0.6.5.3-r1 - ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${P}-patches" - fi - - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - - einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and " - einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable " - einfo "/dev/zfs API developed by ClusterHQ. This means that situations " - einfo "arising from the kernel modules and userland tools being " - einfo "mismatched on future updates will not cause problems." - einfo - einfo "In specific, this should solve the failure to mount filesystems when " - einfo "old modules are cached in an old initramfs provided that those " - einfo "modules support this API" - if use rootfs - then - einfo - ewarn "The older modules will *NOT* work with the new userland code." - ewarn "It is very important that you update your initramfs after this " - ewarn "update." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.3-r5.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r5.ebuild deleted file mode 100644 index a16b87cb3010..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.3-r5.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz - https://dev.gentoo.org/~ryao/dist/${P}-patches-p$((${PR#r} - 1)).tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( - =sys-fs/zfs-kmod-${PV}* - !<sys-fs/zfs-kmod-0.6.5.3-r1 - ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${P}-patches" - fi - - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - - einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and " - einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable " - einfo "/dev/zfs API developed by ClusterHQ. This means that situations " - einfo "arising from the kernel modules and userland tools being " - einfo "mismatched on future updates will not cause problems." - einfo - einfo "In specific, this should solve the failure to mount filesystems when " - einfo "old modules are cached in an old initramfs provided that those " - einfo "modules support this API" - if use rootfs - then - einfo - ewarn "The older modules will *NOT* work with the new userland code." - ewarn "It is very important that you update your initramfs after this " - ewarn "update." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.3.ebuild b/sys-fs/zfs/zfs-0.6.5.3.ebuild deleted file mode 100644 index 9e43172c6aa8..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.3.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.4-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.4-r1.ebuild deleted file mode 100644 index aea524fba7b0..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.4-r1.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz - https://dev.gentoo.org/~ryao/dist/${P}-patches-p${PR#r}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( - =sys-fs/zfs-kmod-${PV}* - !<sys-fs/zfs-kmod-0.6.5.3-r1 - ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${P}-patches" - fi - - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - - einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and " - einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable " - einfo "/dev/zfs API developed by ClusterHQ. This means that situations " - einfo "arising from the kernel modules and userland tools being " - einfo "mismatched on future updates will not cause problems." - einfo - einfo "In specific, this should solve the failure to mount filesystems when " - einfo "old modules are cached in an old initramfs provided that those " - einfo "modules support this API" - if use rootfs - then - einfo - ewarn "The older modules will *NOT* work with the new userland code." - ewarn "It is very important that you update your initramfs after this " - ewarn "update." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.4-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.4-r2.ebuild index aea524fba7b0..20476c4711d9 100644 --- a/sys-fs/zfs/zfs-0.6.5.4-r2.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.4-r2.ebuild @@ -37,7 +37,10 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " +# Adding glibc >= 2.25 blocker for ZFS versions lower +# than 0.7.0, due to bug 617628. RDEPEND="${COMMON_DEPEND} + !>=sys-libs/glibc-2.25 !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* diff --git a/sys-fs/zfs/zfs-0.6.5.4.ebuild b/sys-fs/zfs/zfs-0.6.5.4.ebuild deleted file mode 100644 index 706e33be491b..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.4.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.6.ebuild b/sys-fs/zfs/zfs-0.6.5.6.ebuild deleted file mode 100644 index 706e33be491b..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.6.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.7.ebuild b/sys-fs/zfs/zfs-0.6.5.7.ebuild deleted file mode 100644 index 706e33be491b..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.7.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.8-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.8-r1.ebuild deleted file mode 100644 index 535d86509fdf..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.8-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - sys-fs/udev-init-scripts -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.8.ebuild b/sys-fs/zfs/zfs-0.6.5.8.ebuild deleted file mode 100644 index 706e33be491b..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.8.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - !>=sys-fs/udev-init-scripts-28 -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.6.5.9.ebuild b/sys-fs/zfs/zfs-0.6.5.9.ebuild deleted file mode 100644 index 535d86509fdf..000000000000 --- a/sys-fs/zfs/zfs-0.6.5.9.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) - sys-fs/udev-init-scripts -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.7.0-r2.ebuild b/sys-fs/zfs/zfs-0.7.0-r2.ebuild deleted file mode 100644 index b20cb49f36ad..000000000000 --- a/sys-fs/zfs/zfs-0.7.0-r2.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - !<sys-kernel/genkernel-3.5.1.1 - !<sys-kernel/genkernel-next-67 - !<sys-kernel/bliss-initramfs-7.1.0 - !<sys-kernel/dracut-044-r1 - ) - sys-fs/udev-init-scripts -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.7.1-r1.ebuild b/sys-fs/zfs/zfs-0.7.1-r1.ebuild deleted file mode 100644 index c5bf93725371..000000000000 --- a/sys-fs/zfs/zfs-0.7.1-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - !<sys-kernel/genkernel-3.5.1.1 - !<sys-kernel/genkernel-next-67 - !<sys-kernel/bliss-initramfs-7.1.0 - !<sys-kernel/dracut-044-r1 - ) - sys-fs/udev-init-scripts -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.7.2.ebuild b/sys-fs/zfs/zfs-0.7.2.ebuild deleted file mode 100644 index c5bf93725371..000000000000 --- a/sys-fs/zfs/zfs-0.7.2.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - !<sys-kernel/genkernel-3.5.1.1 - !<sys-kernel/genkernel-next-67 - !<sys-kernel/bliss-initramfs-7.1.0 - !<sys-kernel/dracut-044-r1 - ) - sys-fs/udev-init-scripts -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} |