diff options
author | Richard Yao <ryao@gentoo.org> | 2013-03-15 13:17:06 +0000 |
---|---|---|
committer | Richard Yao <ryao@gentoo.org> | 2013-03-15 13:17:06 +0000 |
commit | 4274bce773bfa17e1729c76bc57e90fda1c947e5 (patch) | |
tree | 5b860301168008f47395b1d1f8629f32d4d3fd66 /sys-kernel/spl | |
parent | Revision bump: EAPI 5, epatch_user, use readme.gentoo eclass, respect LDFLAGS... (diff) | |
download | historical-4274bce773bfa17e1729c76bc57e90fda1c947e5.tar.gz historical-4274bce773bfa17e1729c76bc57e90fda1c947e5.tar.bz2 historical-4274bce773bfa17e1729c76bc57e90fda1c947e5.zip |
Linux 3.9 Support; Install symlinks to make building lustre easier for the Gentoo Cluster team; dodoc miscellaneous documentation; Update github urls on older ebuilds to make repoman happy
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel/spl')
-rw-r--r-- | sys-kernel/spl/ChangeLog | 13 | ||||
-rw-r--r-- | sys-kernel/spl/Manifest | 14 | ||||
-rw-r--r-- | sys-kernel/spl/files/spl-0.6.0_rc14-linux-3.9-compat.patch | 237 | ||||
-rw-r--r-- | sys-kernel/spl/files/spl-0.6.0_rc14-symlink-headers.patch | 13 | ||||
-rw-r--r-- | sys-kernel/spl/spl-0.6.0_rc10.ebuild | 4 | ||||
-rw-r--r-- | sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild | 4 | ||||
-rw-r--r-- | sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild (renamed from sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild) | 18 | ||||
-rw-r--r-- | sys-kernel/spl/spl-9999.ebuild | 18 |
9 files changed, 308 insertions, 17 deletions
diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog index d5bce5ea5b56..3664e78dbcb0 100644 --- a/sys-kernel/spl/ChangeLog +++ b/sys-kernel/spl/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-kernel/spl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.45 2013/02/11 23:27:03 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.46 2013/03/15 13:17:03 ryao Exp $ + +*spl-0.6.0_rc14-r2 (15 Mar 2013) + + 15 Mar 2013; Richard Yao <ryao@gentoo.org> +files/spl-0.6.0_rc14-hostid.patch, + +files/spl-0.6.0_rc14-linux-3.9-compat.patch, + +files/spl-0.6.0_rc14-symlink-headers.patch, +spl-0.6.0_rc14-r2.ebuild, + -spl-0.6.0_rc14-r1.ebuild, spl-0.6.0_rc10.ebuild, spl-0.6.0_rc11-r2.ebuild, + spl-0.6.0_rc12-r1.ebuild, spl-0.6.0_rc13-r2.ebuild, spl-9999.ebuild: + Linux 3.9 Support; Install symlinks to make building lustre easier for the + Gentoo Cluster team; dodoc miscellaneous documentation; Update github urls on + older ebuilds to make repoman happy 11 Feb 2013; Richard Yao <ryao@gentoo.org> -spl-0.6.0_rc11.ebuild, -spl-0.6.0_rc12.ebuild, -spl-0.6.0_rc13-r1.ebuild, -spl-0.6.0_rc13.ebuild, diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest index 34bbdbda0a94..6f1a326a50c7 100644 --- a/sys-kernel/spl/Manifest +++ b/sys-kernel/spl/Manifest @@ -6,17 +6,19 @@ AUX spl-0.6.0_rc13-fix-on_each_cpu-autotools-check.patch 1508 SHA256 1ef61882e68 AUX spl-0.6.0_rc13-fix-soft-lockup.patch 6154 SHA256 85173dcdd261f6aebee9e04098201c58164a74ba01d4a8775d6fb3c7c197c69c SHA512 bbc4d30be0f4425cc1f6076f1ed8d572a8255052f194ad47bde7a9b837689786dcf131326d50f8d4e23d8f0bbf79ce438c273fa33f7c98cdf0bb94c4673c4a0d WHIRLPOOL c4a7efb0858a92da466a69db14f4559188a7f731da7eeaf4f17470a17acb60d81da41c22b6801116d23eb71e4c449097f2ce2af386fd6c3aa915ef7718f49dae AUX spl-0.6.0_rc14-fix-atomic64-checks.patch 2327 SHA256 f3254d8c739ddd013ab99619e11263b5591058012cc9da0c066f60da7d3d52ad SHA512 90e2874904600ad191eb594b9ace2ab85c01943b1c5e190fc89b0b91e322aa30a4a32ecd8a407c14b9f1a103676c9956ce03ae5b7ebbd4ee7b962e86b7565245 WHIRLPOOL 59fb9f8544b1e7698e130985f3b95ad0ff419f8abffc705216f6236ac042b16a1bb7dafda586fed51d6fe2761b10e584f675a03b06a89ca503f6e92e9af87f58 AUX spl-0.6.0_rc14-fix-mutex-owner-check.patch 997 SHA256 7060f161cca637085f0f102a497e26246474bb7239506f7e66cd38b524c711ab SHA512 82b40b9cb92ec3be6b3d22865f807b1925cc273af4bbe798391ce59db044ff0a4b1db48a16c407eee9be48a7c5a92014cb3c2417c1c8783dc2339c3763b5ee44 WHIRLPOOL 3b6deb69e815695ed3fd4100dad27235646563269138cd1abe94084bdd7f5465789c1ee70ed2bc4a8ece5612342c86f57a148571d3b3de5d4a7472d67e8dd4a2 +AUX spl-0.6.0_rc14-linux-3.9-compat.patch 6437 SHA256 830181596f6f1248f304185d6a9016439a09123a08c2d275c7a204ad7240648e SHA512 ea728aa00dfff1e0cf7a433547700a8a435a7eb5a0f3761ab9e133441ccc24aa867df952f00002aba4b587397722b04c015eae82a7e9b523253b09a0ff4cccce WHIRLPOOL 5cb867433c18ca6fb1d1a5a63ef5e875277af53135293b1032dca161488ca66063d5f3783a08e12efe7d4c10dc25970190ab0f29d18f4774db7dca273101576f +AUX spl-0.6.0_rc14-symlink-headers.patch 409 SHA256 71d6f5b832b4e04d2fb00d18a5b91c55bb0909d8421d5c51c80c9cd74ef5cc45 SHA512 cb60bd9d714ee0313932a5c9df0472c83a6f4c969768ea103e5ee12e2e67941fbf5f7caf6d53094aca58eec5a3b3f1d70aaad9d24ef29f6a93dd02b6e1b53077 WHIRLPOOL 53b42b5b0785083cc3b44ebb120e653b09bd175eb3a1e638767ec7c1c339f1284e82d293c4de0ad8993751eb3567c392d2bab88432b355f180c755fce96f63aa AUX spl-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch 2071 SHA256 d34d56201046c6464141c50c815a956e200260c4b17a057af2dde6fdb5fcf949 SHA512 8decd4a803b85b46b5c241eeb0dd7b44e0491a972b08094d763a20d5ef21624ff0bbe79e56098600702f78f506e842c8bbfc3bc94067b86531399b0ba0b4285e WHIRLPOOL 5fbe166099b10e1281e5d824e25acd7f4467766d865e6c297dd8b503906b12bc63221babb0fb6e9fade65679a8637489cec16ac3e6e14d54457c9cda858db9db DIST spl-0.6.0-rc10.tar.gz 523189 SHA256 b25a748b18522f38b495f3577905ccd296f2782d1180140a05bd1efa19113ea0 SHA512 c5a01c9d42afcc3c4069b771fed2cbdc20d621994d2709a06057d93aeecc1b15c442cf5bce4cced90ecf7ac841f610e0b55b678e2bde8b853aeefac4402baf19 WHIRLPOOL 961edac42c35b1ecf65748eb2fc9876ed8cf1207307eedaba41a381e519589859ad5bbe468f7b94d563ec954e10c47237b4540f63a7ea211bbf9d92158f06b11 DIST spl-0.6.0-rc11.tar.gz 521190 SHA256 0f39edfb87c444781080e6f60acbd1094e3113cfc85a23d4e997fe0d53ce3a2f SHA512 d85dd2b10f98028ebc77069e63fd54241d7e8290cf81856cfb82648279e736ce108bc02b21993a87b8e8a046c3a3f37c0a3ede4cd32a4fa6be032316b47c5add WHIRLPOOL d49b863321173fa8effdaa338df4b8171e8db54f11b5f789a618ffa6abbdfcba721d2d38c59bac77786fb2d64096ed1e8f65a42f7ad2ab37a581d5e2493c05cb DIST spl-0.6.0-rc12.tar.gz 546842 SHA256 5352ecfa3bed7807bf4b154121c7f6349d986fea44125bd171240985ef28c898 SHA512 d71db7cc6e8ddec13f90a089a60d9b024f16576ed47b5458b88b7a8efad833b95219d9802c57edf76bfa77e65fd523e31aa768a37f8cd4036c828e7e4cf0534d WHIRLPOOL c6adccbcb9e7c30bead63b94168fc6348cd25ce3348e9e8191797b4100481fb727633760692c8aebb263062b393ae843aeb97718d106ac611e6664d1c5d475b3 DIST spl-0.6.0-rc13.tar.gz 210192 SHA256 500d9c9297f2b7abdc4fce43efe05dddda2edbe403f9ca76d01ae632f798ee1f SHA512 630b63c15e98ada397bc8b8a1a5b6a48255ffa5d7fad8dd0ed9ad7fbede32f3557651effcc99234ffef1a1b9bb13e289c0ca5a2cf60307e0a57ac3a93b709f6b WHIRLPOOL 9330dd1567421e610a714b69d096bbae66c102baaf90fa3daed45cc1a2928eb3dd0e8537f3cf83a7fb2b157bf52ff37b031bcf6c9f52760acd6e480ad335b69a DIST spl-0.6.0-rc14.tar.gz 210495 SHA256 92785e2c2c6caf93ec31175e192a18b27458613a99e6578041f6029875b061e3 SHA512 85d066a97d62ce60f60c552d121c20d5a719e95e0eb6d7ec1b10e29acca1e3429a751bcbb811e9cee2a14282c8908684cb9ee0df9cbc8e53ddfe47da18df4cf9 WHIRLPOOL 6473236476dd9a2d392e2f71fee6810ed83e68f309d1eaaa5fbad1f73ae567ad629db97a2bc81a4ad9e28991f4be3d4100c1b9ab0f65941206afe6e5b03f64ab -EBUILD spl-0.6.0_rc10.ebuild 2725 SHA256 5dd0e5d92b4bb98f2ac0e6c247b675ee9742832e74008c240fe22cbed1b5a134 SHA512 b45629a8c0fb0f3ec51e5a0ed1a9f133c4fca3e3cf4d4ab37af12ac6168cdaa0c332d99fa7dab329c247c9b2e5d437ea0c35e15d16be9c582d0843f00653692c WHIRLPOOL 9bcd72fcfa8e9f06a95ff9e247c449a292a6268786c296742d0431ef0bf5e9d7a173ce3e244807a3e8696cf35a8efaee14892f2d1dae838d68459aba26fc7364 -EBUILD spl-0.6.0_rc11-r2.ebuild 2633 SHA256 afb50729119fd9fcedcd48f4f4f4b36062fb7f4a69c1f67f6fea0b83d35e0ef5 SHA512 f1cbdc1a6c226d711b6e8c8937c349ceb5c06fa416cde3f36992dd932703bb4deeda70ebed563d42a622417d904644b22f8ed3280704d3ed822f66f6ddd8c3e0 WHIRLPOOL 9b288b043971558230be7c728ce3d5317a9b7358a792eceac512274025248ccec0ee45b73d166c052462cd7567b36a814a66c29b7a269e2db15d0459fb5616ad -EBUILD spl-0.6.0_rc12-r1.ebuild 2689 SHA256 c71c87ffdb0bd02acbc5692f6c7c90833badc2ad8616da319dbdd2f265307e80 SHA512 c883bb47acd6f6cf29a28b306c8e25d9acbd8ea1acea6a690d83a783d2289a158856dda93aa6ffda3ebfc41f92ebc307110a95dd7dd105edd0a49bcf58d11947 WHIRLPOOL 4702932aea93b39ba394c41c1a7d8a17060cd915e7da760c9cf00e47413a5e0b2013b0da256f76ddd5282227e23da730dc6dc8333e8698a5cdeef244e735a2de +EBUILD spl-0.6.0_rc10.ebuild 2712 SHA256 a10efa4b4a2ddab0cff98af506c6d841379cc88c37e4f5b6bdedd6be0aacdd32 SHA512 bb6caf0300c9209ea99e862f41ef436ac2ffe9e779011a4030f6fc4d5e928c913f87e3ebf84d7e2ba308118f8d02fc461159aa14f5009c03342a1cbc05656cf0 WHIRLPOOL 2a48e784474e276012d0d16503f43fa92646675c2603857bed3d149d26e6ef4f8570b7cca160a2cfc913f051d23a99916b73b6e7480798cb9b644bdcb6645664 +EBUILD spl-0.6.0_rc11-r2.ebuild 2613 SHA256 65d7c1fd16958c2b26bdd1f06b3527213dca38eef88638a1ab2a55f4c3172c03 SHA512 ca66030ab0563ca627a645cefc72afcef34fe7b909ed05962e907eb3cebfe34820d628b9796934b4d4718c2f9c62b3903e0f9799f77286e7fefa7de1e6246c20 WHIRLPOOL 201ecccad2a5a337c868aa264ba521f5a9a42c183aa0608b4c61d30f1fc15d7a9f75cb2ae1b2a3a5109471466841cc28d6a36ff0f66246352259b9ac6c13165c +EBUILD spl-0.6.0_rc12-r1.ebuild 2676 SHA256 4556339e9dce26573dc3ff6fe7ad255ff5ed3d66b3a8f4763ab4d65f0559be18 SHA512 86cc368821977fdbaaafce1b2a0b405c53c817b7c8903db020e08ce079a4036b68f49357b383124c6d6dd6b121b30aca305026e322f7c5e5748dd65f149174cd WHIRLPOOL 022fdd1efa5c71dfdc68d11eb40ba777f22d10ddaf4f9952eab7b3f34805766523fc837789cfbc2c32a4e712e03cc18c752240100cd5f674c8892e47f0c71bd6 EBUILD spl-0.6.0_rc13-r2.ebuild 2685 SHA256 50b309bd16cdc8c0f1622c9e5d23a02b44f06769fb9989450e77f0de8883b07c SHA512 c47b78ae89443946adc050d6542827d718c465b56eccf17954df951328927b208a53a5784b09e1666478e78d5d943f83ab336b576c6b3c84df61be7aa07a3fb2 WHIRLPOOL cd3e45107d382337cca6cadca74859deb69481eae447854a6b825a0e67ae45f1f45ecd807ffb22b3e6090ec27879f015bf2c055d4827a197b7c2ba4a39e344dc -EBUILD spl-0.6.0_rc14-r1.ebuild 2464 SHA256 cffd632a2c1faa6f5020d51f6d7c3d39a43563960f3f5197b7f34bb7734bfff9 SHA512 8a5358a196b07b23e55d702fca3dae517d7529f8754b80a2f6d62fa65c1daddf57d0c199850da0316917a250cb558f7f7018ba867b5ebb7abc00251e692e4092 WHIRLPOOL e357b6907d86b0624a8b3b80beb33e9176a62e96d2095108bbce8c3b7e162c0f989317e6f829bd9b0f8a18f41dff2624f2921742f26c8c78c3fbcf79312ddaeb -EBUILD spl-9999.ebuild 2456 SHA256 9adc2d8f018fd6053ab82ec16e5e6e84b0122422e2126fa469009bf7cc888bd6 SHA512 c78e9a081186dc2f72a2fd1c43ea2f2131e9bbb38a955f1e4be8c27532666cd53bf083021be97433c23f1e3fb8a6cebb36ba725263c57015d8aa39f596c99170 WHIRLPOOL 00d4e3da3d3e6c1831aad13256928f3686a8089afd18f45521f20d97850a9a2c704958693888d0e345eaaf7380ce18361c09b50f8c23f65b33768c13941db38d -MISC ChangeLog 8182 SHA256 b6d7d66f0f702fe437c8f271b6a085ab2d6b4c7d7bb7f65c43cda3463834f36b SHA512 c6a0acf9c378704110c90f62373d6d71d53d03e1f7f5103d14b9d244b927398944547a98763cb075d9ca1dd866a9451548dfa604c8eb366d89390ce1c416183d WHIRLPOOL 44d5ba018866efd964e2d542964cc6d3dc0f818cabc8cb1a384c4bd78739c28352be14d3080d6530234dce772a41487e07f0ea20dac6b14edc554fac43f369fc +EBUILD spl-0.6.0_rc14-r2.ebuild 2854 SHA256 8622ec7fba75ab0fdff5b12c2e7d1a33cdf2ae45349d92392b6b5b887009f9fd SHA512 c9f141aa20e90eb6a4790cca187ab7231af1ddfb9dca3b90816e3df38b4ac7d9c32e40d841c81155b81082bd17d7219971992350bbefc02d92de639fd44de28b WHIRLPOOL 1a93f08e5b602e658c40dfbb3bd26db8ab37af13f94ad622410c079bf742417c1c629977aebf6e5470b669f2388b255cf3b616b2ee803cec6cb5b976c8b0553f +EBUILD spl-9999.ebuild 2846 SHA256 566b7f71353fb1a37e1e68b13ba70b906a3d40dcf0761664f4358a2e0182dde0 SHA512 6cb09f59bee6c3fd42cd0fc56396f9b9147b90f4b1df307133c7830c4a67dff7870e8fbe3bed7b970aa4d477af4b9e59f63c0f890f1186eee84d4697c455203e WHIRLPOOL 45af783cbce9efedc53a73605c2bacb493a93d5b75f15c672fc3c4d2adfa56a4ca298695658fffca9745819dd2d5f3fca2846465fad66c15874f7377cdc1b1b4 +MISC ChangeLog 8764 SHA256 5ada2bd8ba04efd18c9f41c9797eb2bd4441bbb6e28cd20d79bbc66b7d70cdb4 SHA512 a136552ec3d93be60af3f9ca0e42a888120daa599bfcfff3827b1b35a7399b93bae47a2ca14fa13d3044096123e507662978dd55501b12457228355dfc665c30 WHIRLPOOL 36a3b5b45bbf8f8725fc5c13438865d64a753079537a3c7af3afd41a944b83cb4630929d68fdaf3c74bcfdea8aacff94857c094ac880b36ffcd51e03325901d6 MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-linux-3.9-compat.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-linux-3.9-compat.patch new file mode 100644 index 000000000000..5f9a4c698803 --- /dev/null +++ b/sys-kernel/spl/files/spl-0.6.0_rc14-linux-3.9-compat.patch @@ -0,0 +1,237 @@ +diff --git a/config/spl-build.m4 b/config/spl-build.m4 +index 3dcc05e..6a8e658 100644 +--- a/config/spl-build.m4 ++++ b/config/spl-build.m4 +@@ -64,6 +64,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ + SPL_AC_USER_PATH_DIR + SPL_AC_SET_FS_PWD + SPL_AC_2ARGS_SET_FS_PWD ++ SPL_AC_SET_FS_PWD_WITH_CONST + SPL_AC_2ARGS_VFS_UNLINK + SPL_AC_4ARGS_VFS_RENAME + SPL_AC_VFS_FSYNC +@@ -88,6 +89,8 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ + SPL_AC_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE + SPL_AC_SHRINK_CONTROL_STRUCT + SPL_AC_RWSEM_SPINLOCK_IS_RAW ++ SPL_AC_SCHED_RT_HEADER ++ SPL_AC_2ARGS_VFS_GETATTR + ]) + + AC_DEFUN([SPL_AC_MODULE_SYMVERS], [ +@@ -1684,12 +1687,55 @@ AC_DEFUN([SPL_AC_2ARGS_SET_FS_PWD], + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_2ARGS_SET_FS_PWD, 1, + [set_fs_pwd() wants 2 args]) ++ HAVE_2ARGS_SET_FS_PWD=yes + ],[ + AC_MSG_RESULT(no) + ]) + ]) + + dnl # ++dnl # 3.9 API change ++dnl # set_fs_pwd takes const struct path * ++dnl # ++AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST], ++if test "x$HAVE_2ARGS_SET_FS_PWD" = xyes; then ++ tmp_flags="$EXTRA_KCFLAGS" ++ EXTRA_KCFLAGS="-Werror" ++ [AC_MSG_CHECKING([whether set_fs_pwd() requires const struct path *]) ++ SPL_LINUX_TRY_COMPILE([ ++ #include <linux/spinlock.h> ++ #include <linux/fs_struct.h> ++ #include <linux/path.h> ++ void (*const set_fs_pwd_func) ++ (struct fs_struct *, const struct path *) ++ = set_fs_pwd; ++ ],[ ++ return 0; ++ ],[ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_SET_FS_PWD_WITH_CONST, 1, ++ [set_fs_pwd() needs const path *]) ++ ],[ ++ SPL_LINUX_TRY_COMPILE([ ++ #include <linux/spinlock.h> ++ #include <linux/fs_struct.h> ++ #include <linux/path.h> ++ void (*const set_fs_pwd_func) ++ (struct fs_struct *, struct path *) ++ = set_fs_pwd; ++ ],[ ++ return 0; ++ ],[ ++ AC_MSG_RESULT(no) ++ ],[ ++ AC_MSG_ERROR(unknown) ++ ]) ++ ]) ++ EXTRA_KCFLAGS="$tmp_flags" ++fi ++]) ++ ++dnl # + dnl # SLES API change, never adopted in mainline, + dnl # Third 'struct vfsmount *' argument removed. + dnl # +@@ -2217,3 +2263,53 @@ AC_DEFUN([SPL_AC_RWSEM_SPINLOCK_IS_RAW], [ + ]) + EXTRA_KCFLAGS="$tmp_flags" + ]) ++ ++dnl # ++dnl # 3.9 API change, ++dnl # Moved things from linux/sched.h to linux/sched/rt.h ++dnl # ++AC_DEFUN([SPL_AC_SCHED_RT_HEADER], ++ [AC_MSG_CHECKING([whether header linux/sched/rt.h exists]) ++ SPL_LINUX_TRY_COMPILE([ ++ #include <linux/sched.h> ++ #include <linux/sched/rt.h> ++ ],[ ++ return 0; ++ ],[ ++ AC_DEFINE(HAVE_SCHED_RT_HEADER, 1, [linux/sched/rt.h exists]) ++ AC_MSG_RESULT(yes) ++ ],[ ++ AC_MSG_RESULT(no) ++ ]) ++]) ++ ++dnl # ++dnl # 3.9 API change, ++dnl # vfs_getattr() uses 2 args ++dnl # It takes struct path * instead of struct vfsmount * and struct dentry * ++dnl # ++AC_DEFUN([SPL_AC_2ARGS_VFS_GETATTR], [ ++ AC_MSG_CHECKING([whether vfs_getattr() wants]) ++ SPL_LINUX_TRY_COMPILE([ ++ #include <linux/fs.h> ++ ],[ ++ vfs_getattr((struct path *) NULL, ++ (struct kstat *)NULL); ++ ],[ ++ AC_MSG_RESULT(2 args) ++ AC_DEFINE(HAVE_2ARGS_VFS_GETATTR, 1, ++ [vfs_getattr wants 2 args]) ++ ],[ ++ SPL_LINUX_TRY_COMPILE([ ++ #include <linux/fs.h> ++ ],[ ++ vfs_getattr((struct vfsmount *)NULL, ++ (struct dentry *)NULL, ++ (struct kstat *)NULL); ++ ],[ ++ AC_MSG_RESULT(3 args) ++ ],[ ++ AC_MSG_ERROR(unknown) ++ ]) ++ ]) ++]) +diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h +index 7c4da67..b4778b7 100644 +--- a/include/sys/sysmacros.h ++++ b/include/sys/sysmacros.h +@@ -26,12 +26,17 @@ + #define _SPL_SYSMACROS_H + + #include <linux/module.h> ++#include <linux/sched.h> + #include <linux/cpumask.h> + #include <sys/debug.h> + #include <sys/varargs.h> + #include <sys/zone.h> + #include <sys/signal.h> + ++#ifdef HAVE_SCHED_RT_HEADER ++#include <linux/sched/rt.h> ++#endif ++ + #ifndef _KERNEL + #define _KERNEL __KERNEL__ + #endif +diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c +index e3538b5..f9c1114 100644 +--- a/module/spl/spl-kmem.c ++++ b/module/spl/spl-kmem.c +@@ -404,7 +404,8 @@ kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, const void * + spin_lock_irqsave(lock, flags); + + head = &table[hash_ptr(addr, bits)]; +- hlist_for_each_entry_rcu(p, node, head, kd_hlist) { ++ hlist_for_each_rcu(node, head) { ++ p = list_entry_rcu(node, struct kmem_debug, kd_hlist); + if (p->kd_addr == addr) { + hlist_del_init(&p->kd_hlist); + list_del_init(&p->kd_list); +diff --git a/module/spl/spl-tsd.c b/module/spl/spl-tsd.c +index d7749cf..6e5605b 100644 +--- a/module/spl/spl-tsd.c ++++ b/module/spl/spl-tsd.c +@@ -113,7 +113,8 @@ tsd_hash_search(tsd_hash_table_t *table, uint_t key, pid_t pid) + hash = hash_long((ulong_t)key * (ulong_t)pid, table->ht_bits); + bin = &table->ht_bins[hash]; + spin_lock(&bin->hb_lock); +- hlist_for_each_entry(entry, node, &bin->hb_head, he_list) { ++ hlist_for_each(node, &bin->hb_head) { ++ entry = list_entry(node, tsd_hash_entry_t, he_list); + if ((entry->he_key == key) && (entry->he_pid == pid)) { + spin_unlock(&bin->hb_lock); + SRETURN(entry); +diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c +index 4d571c6..dac452c 100644 +--- a/module/spl/spl-vnode.c ++++ b/module/spl/spl-vnode.c +@@ -175,7 +175,11 @@ vn_open(const char *path, uio_seg_t seg, int flags, int mode, + if (IS_ERR(fp)) + SRETURN(-PTR_ERR(fp)); + +- rc = vfs_getattr(fp->f_vfsmnt, fp->f_dentry, &stat); ++#ifdef HAVE_2ARGS_VFS_GETATTR ++ rc = vfs_getattr(&fp->f_path, &stat); ++#else ++ rc = vfs_getattr(fp->f_path.mnt, fp->f_dentry, &stat); ++#endif + if (rc) { + filp_close(fp, 0); + SRETURN(-rc); +@@ -602,7 +606,11 @@ vn_getattr(vnode_t *vp, vattr_t *vap, int flags, void *x3, void *x4) + + fp = vp->v_file; + +- rc = vfs_getattr(fp->f_vfsmnt, fp->f_dentry, &stat); ++#ifdef HAVE_2ARGS_VFS_GETATTR ++ rc = vfs_getattr(&fp->f_path, &stat); ++#else ++ rc = vfs_getattr(fp->f_path.mnt, fp->f_dentry, &stat); ++#endif + if (rc) + SRETURN(-rc); + +@@ -754,7 +762,12 @@ vn_getf(int fd) + if (vp == NULL) + SGOTO(out_fget, rc); + +- if (vfs_getattr(lfp->f_vfsmnt, lfp->f_dentry, &stat)) ++#ifdef HAVE_2ARGS_VFS_GETATTR ++ rc = vfs_getattr(&lfp->f_path, &stat); ++#else ++ rc = vfs_getattr(lfp->f_path.mnt, lfp->f_dentry, &stat); ++#endif ++ if (rc) + SGOTO(out_vnode, rc); + + mutex_enter(&vp->v_lock); +@@ -827,7 +840,11 @@ EXPORT_SYMBOL(releasef); + # ifdef HAVE_2ARGS_SET_FS_PWD + /* Used from 2.6.25 - 2.6.31+ */ + void ++# ifdef HAVE_SET_FS_PWD_WITH_CONST ++set_fs_pwd(struct fs_struct *fs, const struct path *path) ++# else + set_fs_pwd(struct fs_struct *fs, struct path *path) ++# endif + { + struct path old_pwd; + diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-symlink-headers.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-symlink-headers.patch new file mode 100644 index 000000000000..49fe57bd0c51 --- /dev/null +++ b/sys-kernel/spl/files/spl-0.6.0_rc14-symlink-headers.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 4d8ab0e..6c1a7a5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,6 +35,8 @@ install-data-local: + for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + $(INSTALL) -m 644 -D $$instfile $$instdest/$$instfile; \ + done ++ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ ++ ln -s spl-$$release/$(LINUX_VERSION) $(DESTDIR)/usr/src/spl; + endif + + ctags: diff --git a/sys-kernel/spl/spl-0.6.0_rc10.ebuild b/sys-kernel/spl/spl-0.6.0_rc10.ebuild index 24ac78e39e08..194e8af00b33 100644 --- a/sys-kernel/spl/spl-0.6.0_rc10.ebuild +++ b/sys-kernel/spl/spl-0.6.0_rc10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.8 2013/02/11 23:25:16 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.9 2013/03/15 13:17:03 ryao Exp $ EAPI="4" AUTOTOOLS_AUTORECONF="1" @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then else inherit eutils versionator MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" + SRC_URI="mirror://github/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" KEYWORDS="~amd64" fi diff --git a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild index 98c86795933d..d6655b9dcd31 100644 --- a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild +++ b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.7 2013/02/11 23:25:16 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.8 2013/03/15 13:17:03 ryao Exp $ EAPI="4" AUTOTOOLS_AUTORECONF="1" @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then else inherit eutils versionator MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" + SRC_URI="mirror://zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" KEYWORDS="~amd64" fi diff --git a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild index 1a3b7bbe6075..5798f9b5ab17 100644 --- a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild +++ b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.5 2013/02/11 23:25:16 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.6 2013/03/15 13:17:03 ryao Exp $ EAPI="4" AUTOTOOLS_AUTORECONF="1" @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then else inherit eutils versionator MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" + SRC_URI="mirror://github/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" KEYWORDS="~amd64" fi diff --git a/sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild index 3d577aed0472..fb3b7222e91c 100644 --- a/sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild +++ b/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild,v 1.1 2013/02/06 01:45:21 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild,v 1.1 2013/03/15 13:17:03 ryao Exp $ EAPI="4" AUTOTOOLS_AUTORECONF="1" @@ -50,7 +50,7 @@ pkg_setup() { 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."; } + { kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; } check_extra_config } @@ -59,6 +59,9 @@ src_prepare() { # Workaround for hard coded path sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die + # Provide /usr/src/spl symlink for lustre + epatch "${FILESDIR}/${P}-symlink-headers.patch" + if [ ${PV} != "9999" ] then # Fix x86 build failures on Linux 3.4 and later, bug #450646 @@ -66,8 +69,14 @@ src_prepare() { # Fix autotools check that fails on ~ppc64 epatch "${FILESDIR}/${P}-fix-mutex-owner-check.patch" + + # Linux 3.9 Support + epatch "${FILESDIR}/${P}-linux-3.9-compat.patch" fi + # splat is unnecessary unless we are debugging + use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" + autotools-utils_src_prepare } @@ -88,6 +97,11 @@ src_configure() { autotools-utils_src_configure } +src_install() { + autotools-utils_src_install + dodoc AUTHORS DISCLAIMER INSTALL README.markdown +} + src_test() { if [[ ! -e /proc/modules ]] then diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild index accfa2a6d55f..d77f5f5d16ce 100644 --- a/sys-kernel/spl/spl-9999.ebuild +++ b/sys-kernel/spl/spl-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.28 2013/02/06 01:45:21 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.29 2013/03/15 13:17:03 ryao Exp $ EAPI="4" AUTOTOOLS_AUTORECONF="1" @@ -50,7 +50,7 @@ pkg_setup() { 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."; } + { kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; } check_extra_config } @@ -59,6 +59,9 @@ src_prepare() { # Workaround for hard coded path sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die + # Provide /usr/src/spl symlink for lustre + epatch "${FILESDIR}/${P}-symlink-headers.patch" + if [ ${PV} != "9999" ] then # Fix x86 build failures on Linux 3.4 and later, bug #450646 @@ -66,8 +69,14 @@ src_prepare() { # Fix autotools check that fails on ~ppc64 epatch "${FILESDIR}/${P}-fix-mutex-owner-check.patch" + + # Linux 3.9 Support + epatch "${FILESDIR}/${P}-linux-3.9-compat.patch" fi + # splat is unnecessary unless we are debugging + use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" + autotools-utils_src_prepare } @@ -88,6 +97,11 @@ src_configure() { autotools-utils_src_configure } +src_install() { + autotools-utils_src_install + dodoc AUTHORS DISCLAIMER INSTALL README.markdown +} + src_test() { if [[ ! -e /proc/modules ]] then |