diff options
18 files changed, 25 insertions, 1275 deletions
diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog index b4b75458e5c1..459264bbe742 100644 --- a/sys-apps/module-init-tools/ChangeLog +++ b/sys-apps/module-init-tools/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for sys-apps/module-init-tools -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.187 2012/11/24 21:14:02 ssuominen Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.188 2013/01/19 23:29:12 ssuominen Exp $ + + 19 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> + -files/modutils-2.4.27-alias.patch, -files/modutils-2.4.27-build.patch, + -files/modutils-2.4.27-flex.patch, -files/modutils-2.4.27-gcc.patch, + -files/modutils-2.4.27-hppa.patch, + -files/modutils-2.4.27-no-nested-function.patch, + -files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch, + -files/module-init-tools-3.2.2-handle-dupliate-aliases.patch, + -files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch, + -module-init-tools-3.6-r1.ebuild, + -files/module-init-tools-3.6-hidden-dirs.patch, + -files/module-init-tools-3.6-skip-sys-check.patch, + -module-init-tools-3.10.ebuild, -module-init-tools-3.11.1.ebuild, + -module-init-tools-3.12-r1.ebuild, -module-init-tools-3.13.ebuild: + old 24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> -module-init-tools-3.5.ebuild, -module-init-tools-3.8.ebuild, diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest index 44da4b2b3068..bbee859ae07a 100644 --- a/sys-apps/module-init-tools/Manifest +++ b/sys-apps/module-init-tools/Manifest @@ -1,44 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674 SHA256 8735f921aadd901b98983ce9678d3e7babb9fd3553ce7881460c050dc5611f66 SHA512 265ced4e4c644443a1ee2a6f422897001b3d5685f7d580f6cc616b651502b98e1eadc36e8e032b635dde1b83d4ebe3608aeef2afef8a9d16474f72f28e694652 WHIRLPOOL bd26d220623675f62a60c40eca7e3391bd3a236adce2994d7a6c124568b3f78d465dc83b8f4f59509915d9965d2d16e52db0b101d809dfcf404329ef185cd595 -AUX module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345 SHA256 6cd1ae6736bec9c72474acb6b7dce68db1ec0703f0b55f312dcfefce7cf56166 SHA512 a8c33b3099be3a49bd7b64daba0d83eb9deacdaa56c44cd4f33841251a039b6400ddddf38ea0d2e172d097cf81af5f1f509abf137b0f7112e68c4d41d3a41a3c WHIRLPOOL 0221b5e46dacdf22c147a11483386f00b0c3e8ea91eaffdb49b5f18f35fcdf5b729950e1a3d8120f8b97879fe1e3dd737e1967c02a907411b3d93c2c6c090a02 -AUX module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425 SHA256 5a058a5dfae5bd6eaf6fa338b800f477b542dd9da0c09283d274504beb19c3b6 SHA512 ef169a9957c0398b142f85a74cd29e8c0a4cd784aa1d693c0f9108a51297f92a28ae12bc81dd7c99309c413493a7c5d97bee895003c8fd6df0542f1ae288ba7e WHIRLPOOL de974a19f6ab668ecc24a8576836b55a4f5898d0ffd694660092c7f7e66b7fc8dead672dfe38eff327aad26b368750b13b7ee5634aed46f7902e0d3014cd5b83 -AUX module-init-tools-3.6-hidden-dirs.patch 372 SHA256 cf89453c57dce3b839c062f6fd89ced1f72683e1635e761fae2f6b651f69d36a SHA512 28958b5fe0a083065bec1e3f8705f4341e1041d2dbe5a1aa8a8006e29afc47a869a92ccf126cccc20c23928fff935807946bf58cb8b37270641d7c57ed69ed69 WHIRLPOOL dce0846f56a784936e393b0e98feb630f37ca224fd07f1a1e3e1e43a7dbafcb80917aa73683eef50abe6b82fad67c35204ea96c15d33c9ab90e08e69745561b7 -AUX module-init-tools-3.6-skip-sys-check.patch 1775 SHA256 1888621529238d1d449e1cf1ba0842070fff6b79de8a58602b877f369a98f2f3 SHA512 53e37d9070ecbbd4981aabcafb98485693a7b761aa0d3f8b96a33fb511ee0d68181c1b67feac311ed4d00ab57ac91d66b415dd9717ddb289aa4db61f05271293 WHIRLPOOL 28d870c2d8e6518eed60462b982cceac9ce11c847aa028ce493ff15fed64d263e2e25bfce24049b0758df408dd09ac981f4e0f85a441447d6c6f94716e5b29af -AUX modutils-2.4.27-alias.patch 2246 SHA256 453e3ab982088e2e85164e63b4944af58cd01c2b2d45d75fdcda6649a339878f SHA512 e843cdcdca309646d8cb9db148db61bb6d9605068fbfc006be7c392d3349856c101899f26d39e3778a674bc9b64830bdc273484d1ccf37994eaca1cff594edc6 WHIRLPOOL 16e4d475030f0e8b85a3e810d4281422b7a13c186f24058c602bafa6dda9565d33fb799767cc75a935de7b2f73f7d939306feb7f62b411c7ed0eb9b007dcdce9 -AUX modutils-2.4.27-build.patch 948 SHA256 7b015de3c739e996247edcda9a1df59fa871f4e93a408a8033f0e64c36325703 SHA512 06abca88ce5132374cbd2361b70dbfd7c7194f5854241353a630bed46717d78b15101f8f455bee9c13bd072b9438cb7e8e51215e82616787cf5d016c2503ca77 WHIRLPOOL b736f6de536b8ece36756df007122bd927766b6675d376d56a0189ac73f8cdf87833686542ed0f9d06235d6fbe1e90f4593ec0338495365d37c890e1f41077ee -AUX modutils-2.4.27-flex.patch 805 SHA256 dbe0c3207751157e7b104d66bdfeea280343ceabe856dc5d51849c206fdccad9 SHA512 2d427b2c9b5d45866a704caa3b564c986106aeb1c60898efa54c7272bcb536fa13a46df6970a8a0b6020bdbe4c86903503a2ec0e15092d0c254f9b5a940c2374 WHIRLPOOL 9710819b491b015cfa4aaad506298d0da9a2559805ec447da6481ddd6d0ed5379407db4444a58d99919b0a58223670a0cdea4451149b1c0e75da8a4870518999 -AUX modutils-2.4.27-gcc.patch 7438 SHA256 8ecda7ac4010c54e7fbdd8b2109b5c19ea2266f67d430ab6413188c63cdca2a6 SHA512 2f7a8bf91807409611edcb76b9ad110838bf50850325d0d8ce9f74ccf74114cafff7854e3dad6af7b1c35531486c172fe5e7b16ab6a22042d4a354c0e0097dba WHIRLPOOL b8d581710c3c6be7dddbbaecbaaa2ce1c6dc7a02188a154c60c21d47a3fa6cca6b4cd1c8056aefc32bd284a14e3e16016ef8ba1a029be47f6b40af5654912ffc -AUX modutils-2.4.27-hppa.patch 302 SHA256 9b4e629a310732129b96766e0c6f185008e98f8429551da85372a01fa59c7d05 SHA512 bd03468d3e362bcf7d77db72a08bd37421af478675c247fec4adb6ceab6a475a32513ca370227a1d4dd0c506eb0158d073aed74d5ba6438d47fb966645863fe2 WHIRLPOOL 0fff63b0c642ccc736b4725a6d235c566608686d00e8bf29a56ecf9e9fe4383db649d2601854241c63606e28edc049ef208b27ae42fc5c883347e864ebfd7e2b -AUX modutils-2.4.27-no-nested-function.patch 1422 SHA256 3e9961a7c9411e8c01eb48d9053d7901ec7a90ee0e070e85bd766385f36d563d SHA512 0a01f28f9d3f803b1e148af382b396ad793354363c36e690ed5a731c31482bc8b909fcf77902b62f50967e1ed782ec9e53412c906117dc3d7d12b1f21ecf075a WHIRLPOOL 5999f108eb31a12be9fb1dab005d30f536f790b70a0d6d05bf31c6bbcb583076d3285824a9c84f8ffee15a68d0d0beae7866b451c4372d8b3c7ce69c9e324fb2 AUX update-modules-3.5.sh 10519 SHA256 b8866f643d369569de040b89c997b6a864ec3f0767a5e86b78d4b0badaa267c9 SHA512 53b420eedf3f70e675de8cf80978d198424ed426584fc799e2f106e1cf4b65fbfcf172f3a0e7b5e1684e07420d67c0d27866a901b40df46623ec67a3a018b7f0 WHIRLPOOL c80dd21ac00b42be379a43e9cfc2a8359e47de1a6ad5e7f4120e3bf9d7ddc4d3306317a97a8c724da2f0631d00dbb35108917d9046354542458958d0feb10481 AUX update-modules.8 3210 SHA256 4e352ee28ecaf79fac2a0216b8b4b52ced864cd258752f33213d1ac8f4a5849c SHA512 47a5e0e14e321e29a1d16705a8d2de19b9e3bbf15b6955a0e8c6963a50d30d12b71c4eb8237a7a37fd881d217f41ce5ea87a768be30b94dedf709e379ee5a31d WHIRLPOOL 7c2da6b779ef8a749272c7186669e08c270873aa49a0df7ff1d57756adb3512b26c3f56cd1585d1ad2e07732ce7163fb6d85d7ed0058e68fd9aa2a50e18b4c5b -DIST module-init-tools-3.10.tar.bz2 885014 SHA256 fef01424081e728ff6fadc96a8e9b6e4efe3d21f315f1e27b1a16abf7047c12b -DIST module-init-tools-3.11.1.tar.bz2 200815 SHA256 c5bc5fba03769fec786a305abdf97f37c5d7a33e61b92f4ee4f1b80cbc1d1dc0 -DIST module-init-tools-3.12.tar.bz2 938086 SHA256 d012ab07ea26721467a85a775f34747c1c8897e37f16bec5317d8a72ef8b4f17 SHA512 7c64619148eaf4eb755aca785c6d551d8c05e30b85632ebea00cb939e37f4c8abb28ecd5200e37ea0b204741048db991386eed77c7d6d35414d64421c022a82f WHIRLPOOL 46d9663db93f924225206d9a7ffe5a0a6457e0dcbc81feba8b92d31702961e7469553f890ac9bed8017ba32600132706db4346ca99df9c973c509853c87c9c9c -DIST module-init-tools-3.13.tar.bz2 975594 SHA256 6a29185d09fab7c30817d57994336bb2e1a9da5b80b82c8b282d2c08a221925b SHA512 eb99e77ae95365ca9424f44921716c5c50d612b5f2b1e6f5204e01aa1b1368b9c84131c0861ff57d94a96c10254917aedfee5ef0edd076a8a20d61d077e076b8 WHIRLPOOL 9856fd9052e81170696d6275e9671328bc147ed0b8593d785edb0adbff85617fe38fd97757f872d7b855cebf860779d1f407297a34fb28c852d0f6b9e0e62635 DIST module-init-tools-3.16-man.tar.bz2 9300 SHA256 a80cfeb48279964b2c515ab5ca06925dd22d2187ae1043992650bf7950fc36c8 SHA512 02c7d01412493c8b24d9fd6f7c8bd758a804936e7ccf2dbfe2aeafb01b9e612d55d769ea7c16366fd4a1d07653adace087ab1d84ca9cf60a830dc5866fa7b278 WHIRLPOOL 31d9aaf6cc9ed0a1a11e344610520a2cfd8134e951e4946171c4e92923b3ea3cb1d86e7d9d815d352155af401f558ac6dcfa1a310ed24582cb87854a297c456e DIST module-init-tools-3.16.tar.bz2 228821 SHA256 e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b SHA512 c234d66b5981cf9b74a5bec2a9c139f33088c8c65c32c1a30ef6d2b335d72761eac09fd958d694828860ab85dffee518286d8a5f41565539a7cca5d402e467a2 WHIRLPOOL d27ad6694dc44536d61dd90746e6a7e9b852bc49d5c67c9203a817dd3f9ce62552711add0221c1abb24373b8d1e223fd9047d6a6bdc256484698b3e3844b86a4 -DIST module-init-tools-3.6-man.tar.bz2 8872 SHA256 a8b5dcc3572619d604645292abd7adf508511141a3bdb94cf58f79eb86836b22 -DIST module-init-tools-3.6.tar.bz2 230327 SHA256 64a0b3b058f2236be1a8138356306c91e5f23f149a131428e4c7d97b1c050728 -DIST modutils-2.4.27.tar.bz2 234963 SHA256 ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0 SHA512 5a638ea757f9d2cd7e91a8711eadfc6c723ca3b75757363620c8128772b9c00ddeb46af853711ce4c845096ad322a1dd2e8429be3d2e0a371ca93b1c81aa089d WHIRLPOOL baf623c4e5fe2c92139c27caa317694d8e3e9c60b875c8470218d6ed450e8bb52f8c11c34a1dc855aa3399648b06b77578d08966ec177b1ad7169fb622aef590 -EBUILD module-init-tools-3.10.ebuild 1373 SHA256 4cf6d1d551dd388abf2d33ae4424756537c7fc5f73e46c5dbf64dc13ce1cea6b SHA512 20cd748c3d1ab8fbdbe1b6695839b67dcb864752ff8df4eaf3fb9eddb7e5f88e904c20f4934062202b1ffb90686412a922aace40d34b589d8e821e536b669e16 WHIRLPOOL 5f363d76826845938b0e8531fe85f07f4300e284d66fab576695a1ddbbe51f31383f7958113e23fb4c5677ee564471d01d105a88dc94afcbbe6e0f8ccc3e676d -EBUILD module-init-tools-3.11.1.ebuild 2606 SHA256 a0e05b7c7ec0f9170e0ac7205637c88f27e18a45d353e666711d3f6131cb9eba SHA512 68fde420e5d9016d5bb3d24a6f342f3b2d24cd787ddf4ca3e69c4e20605044ab746ebcb75b4cfc7e3a4fd4bafed7cf47889d6e4ba18343b90487e0bf13271635 WHIRLPOOL 54934bb8ddd61ad498ed7d56223668a149307aa15a786329ede22e7625abeada5d807f3042881d6dfabc7b0ea19a63b5718b403428ebcc2f4ea8ecc5b4c260a2 -EBUILD module-init-tools-3.12-r1.ebuild 2970 SHA256 fe313cb7230b024694638744041a188507291697f2cd77a9caa6bc04c53b4dc5 SHA512 fd514a0bfff00b1ef6b87bad2608bf5b4475c2098799529f57f33455762073fdb46681ff240d7231bcf25d77f87cbf842018c434a9c99f72f088c08eadd01749 WHIRLPOOL dfde0f5a6d4f3b9841de77935d8cd40dddcd7cc492fb030ad01f639fb8b69f30615d994b3d70d283a41acb8a86bfbbe425bc44352d3a4d71c2b6e554d94b7018 -EBUILD module-init-tools-3.13.ebuild 2963 SHA256 fc50a4f058e81d4bed91afd332195156498ebe8aa860f454aa1641e19fe2e0e0 SHA512 ed84cdbe4cd3efb77eb3c9df8bb65d4d384d0802cedcaf66cac9f5ecef75e17118eeafbd9f24a143f1f1cc2c733b25ac85d4d059e1334e16213b3921c4aa648d WHIRLPOOL 9a07e46f1cfbba02c509dae0c4ecd79422bd6b925e8a3cd56cc8b0791e237a4c7f91a3617cde1e0ce3a759c349efb8cc210a48cd35a4742726fe1af54dff994d EBUILD module-init-tools-3.16-r2.ebuild 2920 SHA256 44cb50f004ef204f104513a53b664517db5417d5e35411a695dede8b06638832 SHA512 43321ed52444f71943fa731911ea4c5fb4d59ab627417e451ae10a34c979b3b5c92cf66bcaa69b36f1ca6fa645dca486485b8d9265526bd513032830dc17559a WHIRLPOOL e3190d09bbef48fa105ec2ff549116c7f26af8c129782b4f5c7d1ad18499250b43ad0dc5e0b44c9fcf2a291be5c3e3a09894d7a785c4196052dd6cdbfe3b9e83 -EBUILD module-init-tools-3.6-r1.ebuild 5357 SHA256 6912a0aac2fd3c9a0bd2638a78a09aa555305be98478d94dec53ce3d3d224dbb SHA512 a51f2e746920bcf7d2492b32b63d4ede92c2ffe42be5a1b296ce341c44c2534b0e008c608347849764167305b03845a8428bec466dd9ac3907ef7083b31be8e2 WHIRLPOOL 402bef11f23f5b1b825c300f2922a7b25923c40ce7103219767f12e92cd3f51e4696d7e57b0cd569e41fdbbf7843f403216fde6905a0c4037e8a920eff7641d3 -MISC ChangeLog 32112 SHA256 10a35612bc5974fd62a98c598b29bdf020e1689d29c5537e3805b63e8b8a810f SHA512 88998a675f71bcf0e2c41a09b57fad1120d57a7ed9539b4817e3dee07b27393add6edb992256b83c489175780308875c809934e170073d4a6a7246862cfbef94 WHIRLPOOL dbf58e3fcde3d6d846ac124de979e524cb98aebc3d3b9b6c1ac1f9a45d685fe30cf76266d8b232393992f60b9fd4b6adef7857feb3308577a910720a946226ff +MISC ChangeLog 32885 SHA256 2bdaf45d2c66970229f41a46ddfdc88f4c45924005bb21145969e31f42ec722b SHA512 5d57c186002313cfe8ef1cc87705eda6365f359063c81287a1f7cd83063bc2d927b1ab13e2e63a60d3c2cc1c73b0ad3f483c1bc4431fc79f609b4b1491f52cea WHIRLPOOL ddff80939fab0c1878ab4b532cc261136757d36c17c0175213031a3797f5966aa6412001df3335f82c4cdb17bb663f543c8dc358b990723582fd08e7ca3a9043 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQsTh3AAoJEEdUh39IaPFNkHQIAIUxSBEH1PhHr/bUnz3xnjUe -AqNjUY3vtr2UA93aeXo4zsclQiOh4M4MiuXuqAC7Lubuh0TtPTe/cJiTjsp7LXBg -vjLqZSGiGphB2t/u2REijpl427uD9i5Iua+hvHTAyK7enrBOyXU2ZOxiINEFXLDP -xAUS7JTutQLeYvar73Rs5FitYpfYlWXoZO5UY+pPISN+5TvLTzQCLfRqSw1/m6hn -OZCDz+YREMgCi4wn5kbg/zvcTT3lSdxon4gLIasvOcQmA9NdlFZw2wG8X02rh0FF -q/Ga5Td8snZQl3WJ4G+03COOmqFlRrfSAJzD/L7xBDpypXF3uzbLfz8smc8Ggew= -=BOyQ +iQEcBAEBCAAGBQJQ+yvuAAoJEEdUh39IaPFNDyUH/invjsnk5oiKIafsgGXvoWDt +CUZv+vfLPfFNx+xK3dLm5GtuWX9E/QY9ZhxKzP7/p9esUpjuGW+k9ZUCIrR4CBl9 +2SW1fDcPpcW5QAsz2CgDpeWc6B7ST3xY+inx9brsUYdTkCvUF2cdDXtnVEe5EX4h +7PgLIkJYnsLSM17I8aNXo9VhiYvwkjLrBEdYDW98Xo0WcHjAIB40gNaZtlKjRDWy +wrYT02UdMOsx3hbhYVSxiY7/0SKnwvrl5d/DXNnN2WhjvjcUrje5BFvaoEoIUGaO +LhRCrqXYAMlfXbAfYmps3BEe2tqb3Y4I3AYcb6a4BrrPIniRRPhTEfyRNg2Op5Y= +=xUl5 -----END PGP SIGNATURE----- diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch b/sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch deleted file mode 100644 index 19cfd26d4110..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- generate-modprobe.conf -+++ generate-modprobe.conf -@@ -1,20 +1,35 @@ - #! /bin/sh -e - - # Naive shell script to translate modules.conf + defaults to modprobe.conf - # Normal caveats apply, as with any machine translation. --if [ $# -gt 2 ] || [ x"$1" = x--help ]; then -- echo "Usage: $0 [--stdin] [modprobe.conf]" -- echo " Converts your current modules setup to modprobe.conf." -- echo " Don't trust it too much." -- echo " Version 0.1" -- exit 1 --fi -+# -+# Updated 07 May 2004 by Aron Griffis <agriffis@gentoo.org> to support -+# --assume-kernel option for Gentoo LiveCD building. See -+# http://bugs.gentoo.org/49927 - -+# Parse command-line - STDIN= --if [ "$1" = "--stdin" ]; then -- STDIN=1 -- shift --fi -+KV=`uname -r` -+while [ -n "$1" ] ; do -+ case "$1" in -+ --assume-kernel=*) -+ KV=${1#*=} -+ ;; -+ --stdin) -+ STDIN=1 -+ ;; -+ --*) -+ echo "Usage: $0 [--stdin] [--assume-kernel=n.n.n] [modprobe.conf]" -+ echo " Converts your current modules setup to modprobe.conf." -+ echo " Don't trust it too much." -+ echo " Version 0.1" -+ exit 1 -+ ;; -+ *) -+ break;; -+ esac -+ shift -+done - - # Set up output if specified. - if [ $# -eq 1 ]; then exec > $1; fi -@@ -221,7 +234,7 @@ - ($0 $MODULE) - ;; - # Ignore default lines which are not required any more. -- "path[boot]=/lib/modules/boot"|"path[toplevel]=/lib/modules/`uname -r`"|"path[toplevel]=/lib/modules/2.4"|"path[kernel]=/lib/modules/kernel"|"path[fs]=/lib/modules/fs"|"path[net]=/lib/modules/net"|"path[scsi]=/lib/modules/scsi"|"path[block]=/lib/modules/block"|"path[cdrom]=/lib/modules/cdrom"|"path[ipv4]=/lib/modules/ipv4"|"path[ipv6]=/lib/modules/ipv6"|"path[sound]=/lib/modules/sound"|"path[fc4]=/lib/modules/fc4"|"path[video]=/lib/modules/video"|"path[misc]=/lib/modules/misc"|"path[pcmcia]=/lib/modules/pcmcia"|"path[atm]=/lib/modules/atm"|"path[usb]=/lib/modules/usb"|"path[ide]=/lib/modules/ide"|"path[ieee1394]=/lib/modules/ieee1394"|"path[mtd]=/lib/modules/mtd"|"generic_stringfile=/lib/modules/`uname -r`/modules.generic_string"|"pcimapfile=/lib/modules/`uname -r`/modules.pcimap"|"isapnpmapfile=/lib/modules/`uname -r`/modules.isapnpmap"|"usbmapfile=/lib/modules/`uname -r`/modules.usbmap"|"parportmapfile=/lib/modules/`uname -r`/modules.parportmap"|"ieee1394mapfile=/lib/modules/`uname -r`/modules.ieee1394map"|"pnpbiosmapfile=/lib/modules/`uname -r`/modules.pnpbiosmap"|"depfile=/lib/modules/`uname -r`/modules.dep"|"persistdir=/var/lib/modules/persist") -+ "path[boot]=/lib/modules/boot"|"path[toplevel]=/lib/modules/$KV"|"path[toplevel]=/lib/modules/2.4"|"path[kernel]=/lib/modules/kernel"|"path[fs]=/lib/modules/fs"|"path[net]=/lib/modules/net"|"path[scsi]=/lib/modules/scsi"|"path[block]=/lib/modules/block"|"path[cdrom]=/lib/modules/cdrom"|"path[ipv4]=/lib/modules/ipv4"|"path[ipv6]=/lib/modules/ipv6"|"path[sound]=/lib/modules/sound"|"path[fc4]=/lib/modules/fc4"|"path[video]=/lib/modules/video"|"path[misc]=/lib/modules/misc"|"path[pcmcia]=/lib/modules/pcmcia"|"path[atm]=/lib/modules/atm"|"path[usb]=/lib/modules/usb"|"path[ide]=/lib/modules/ide"|"path[ieee1394]=/lib/modules/ieee1394"|"path[mtd]=/lib/modules/mtd"|"generic_stringfile=/lib/modules/$KV/modules.generic_string"|"pcimapfile=/lib/modules/$KV/modules.pcimap"|"isapnpmapfile=/lib/modules/$KV/modules.isapnpmap"|"usbmapfile=/lib/modules/$KV/modules.usbmap"|"parportmapfile=/lib/modules/$KV/modules.parportmap"|"ieee1394mapfile=/lib/modules/$KV/modules.ieee1394map"|"pnpbiosmapfile=/lib/modules/$KV/modules.pnpbiosmap"|"depfile=/lib/modules/$KV/modules.dep"|"persistdir=/var/lib/modules/persist") - ;; - - # Ignore prune lines unless they end in .o or .ko, which would diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.2.2-handle-dupliate-aliases.patch b/sys-apps/module-init-tools/files/module-init-tools-3.2.2-handle-dupliate-aliases.patch deleted file mode 100644 index e119ce6bee8e..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-3.2.2-handle-dupliate-aliases.patch +++ /dev/null @@ -1,68 +0,0 @@ -http://bugs.gentoo.org/149426 - -keep from blowing up when people have duplicate aliases ... the grep -ends up including new lines and with certain formed comments, hits an -infinite loop ... - -for example, the following inputs illustrates the problem: ----------------------------------------------- -# Old nvidia support ... -alias char-major-195 NVdriver -alias /dev/nvidiactl char-major-195 -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 -# To enable Side Band Adressing: NVreg_EnableAGPSBA=1 -#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1 -#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3 ----------------------------------------------- -alias a b -alias b a ----------------------------------------------- - -fixes from Martin Väth - ---- generate-modprobe.conf -+++ generate-modprobe.conf -@@ -65,19 +65,29 @@ - # Resolve (possibly recursive) alias: args filename alias - resolve_alias() - { -- RA_RESOLVE=`grep "^alias[ ][ ]*$2[ ]" -- $1 | awk '{ print $3 }'` -+ if [ 0$3 -gt 99 ]; then -+ echo "Infinite recursion detected; aborting after $3 tries (alias '$2')" 1>&2 -+ return 1 -+ fi -+ -+ _RA_RESOLVE=`grep "^alias[ ][ ]*$2[ ]" -- $1 | awk '{ print $3 }'` -+ RA_RESOLVE=`echo "$_RA_RESOLVE" | head -n 1` -+ if [ x"$_RA_RESOLVE" != x"$RA_RESOLVE" ]; then -+ echo "Invalid dupliate alias found for '$2' (results: `echo $_RA_RESOLVE`)" 1>&2 -+ return 1 -+ fi - if [ x"$RA_RESOLVE" = x ]; then - echo $2 - return - fi - # Recurse. -- (resolve_alias $1 "$RA_RESOLVE") -+ (resolve_alias $1 "$RA_RESOLVE" $(($3 + 1))) - } - - # Parse alias: args filename modulename aliasto. - parse_alias() - { -- PA_ALIAS=`resolve_alias $1 $3` -+ PA_ALIAS=`resolve_alias $1 $3` || exit 1 - NAME=`echo $2|sed -e 's/\(block\|char\)-major-\([0-9]\+\)$/\1-major-\2-*/'` - - echo "alias $NAME $PA_ALIAS" -@@ -180,7 +190,8 @@ - parse_options $MODULE `grab_noninstall_options $REST` - INSTALL_OPTIONS=`grab_install_options $REST` - INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE" -- eval install_$MODNAME=\"/sbin/modprobe $INSTALL_OPTIONS --ignore-install `resolve_alias $MODPROBECONF $MODULE`\" -+ INSTALL_ALIAS=`resolve_alias $MODPROBECONF "$MODULE"` || exit 1 -+ eval install_$MODNAME=\"/sbin/modprobe $INSTALL_OPTIONS --ignore-install $INSTALL_ALIAS\" - ;; - *) - parse_options $MODULE "$REST" diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch b/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch deleted file mode 100644 index ed217bdc3cb3..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch +++ /dev/null @@ -1,37 +0,0 @@ -Abort generate-modprobe.conf if modprobe fails, bug #68689. - ---- module-init-tools-3.2-pre7/generate-modprobe.conf 2005-07-15 11:21:54.000000000 +0200 -+++ module-init-tools-3.2-pre7.az/generate-modprobe.conf 2005-07-15 11:24:33.000000000 +0200 -@@ -35,22 +35,28 @@ - MODPROBECONF=`mktemp /tmp/modprobe.XXXXXX || tempfile || echo /tmp/modprobe.$$` - trap "rm -f $MODPROBECONF" 0 - -+modprobe_abort() -+{ -+ echo Failed to to run modprobe. Giving up. 1>&2 -+ exit 1 -+} -+ - if [ x"$TESTING_MODPROBE_CONF" != x ]; then - cp $TESTING_MODPROBE_CONF $MODPROBECONF - elif [ "$STDIN" = "1" ]; then - cat > $MODPROBECONF - elif [ -x /sbin/modprobe.old ]; then - # In sbin. -- /sbin/modprobe.old -c > $MODPROBECONF -+ /sbin/modprobe.old -c > $MODPROBECONF || modprobe_abort - elif modprobe.old -c >/dev/null 2>&1; then - # Somewhere in path. -- modprobe.old -c > $MODPROBECONF -+ modprobe.old -c > $MODPROBECONF || modprobe_abort - elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then - # Running /sbin/modprobe gives old version. -- /sbin/modprobe -c > $MODPROBECONF -+ /sbin/modprobe -c > $MODPROBECONF || modprobe_abort - elif modprobe -V 2>/dev/null | grep -q 'modprobe version'; then - # Running modprobe gives old version. -- modprobe -c > $MODPROBECONF -+ modprobe -c > $MODPROBECONF || modprobe_abort - else - echo Cannot find old version of modprobe. Giving up. 2>&1 - exit 1 diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.6-hidden-dirs.patch b/sys-apps/module-init-tools/files/module-init-tools-3.6-hidden-dirs.patch deleted file mode 100644 index 9d215bc12e9f..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-3.6-hidden-dirs.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://bugs.gentoo.org/245271 - ---- a/modprobe.c -+++ b/modprobe.c -@@ -1289,6 +1289,12 @@ - DIR *dir; - int ret = 0; - -+ /* Ignore hidden dirs. This allows people to maintain things with -+ * SCMs like .svn/ or .git/ or ... -+ */ -+ if (filename[0] == '.') -+ return 1; -+ - /* Reiser4 has file/directory duality: treat it as both. */ - dir = opendir(filename); - if (dir) { diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.6-skip-sys-check.patch b/sys-apps/module-init-tools/files/module-init-tools-3.6-skip-sys-check.patch deleted file mode 100644 index e965e25b48ff..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-3.6-skip-sys-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -http://bugs.gentoo.org/258442 - -From 1a55ee5297b883ea4b43cdf74ad890873ebe966c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 13 Feb 2009 02:21:10 -0500 -Subject: [PATCH] modprobe: remove pointless /sys requirement - -When modprobe was converted from parsing /proc to parsing /sys, it was not -a straight conversion. Instead, a "sanity" check was added early on where -modprobe would simply abort doing anything useful if /sys isn't mounted. -Unfortunately, this makes modprobe fairly unusable. Considering the -kernel itself can invoke modprobe before userspace gets a chance to start -the init process (and actually mount /sys), we end up with a chicken and -egg issue. Which gets even worse when the kernel keeps running modprobe -over and over and the boot output fills up with: -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. - -Since modprobe itself is already written to handle the case where it -cannot figure out whether a given module is loaded (and so was able to run -perfectly fine without /proc being mounted), the check is wholly useless. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - modprobe.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/modprobe.c b/modprobe.c -index 022004c..110204b 100644 ---- a/modprobe.c -+++ b/modprobe.c -@@ -1522,11 +1522,6 @@ static void handle_module(const char *modname, - const char *cmdline_opts, - int flags) - { -- struct stat finfo; -- -- if (stat("/sys/module", &finfo) < 0) -- fatal("/sys is not mounted.\n"); -- - if (list_empty(todo_list)) { - const char *command; - --- -1.6.1.3 - diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch deleted file mode 100644 index 1fefffb62f85..000000000000 --- a/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch +++ /dev/null @@ -1,86 +0,0 @@ -Taken from Debian. - -Update misc alias cruft. - ---- util/alias.h -+++ util/alias.h -@@ -52,7 +52,11 @@ - "binfmt--310 binfmt_java", - - "block-major-1 rd", -+#if defined(__s390__) || defined(__s390x__) || defined(__ia64__) || defined(__powerpc__) -+ "block-major-2 off", -+#else - "block-major-2 floppy", -+#endif - "block-major-3 ide-probe-mod", - "block-major-7 loop", - "block-major-8 sd_mod", -@@ -107,6 +111,7 @@ - /* /dev/sunmouse Sun mouse */ - /* /dev/beep Fancy beep device */ - /* /dev/modreq Kernel module load request */ -+ "char-major-10-116 snd", - "char-major-10-130 wdt", /* /dev/watchdog Watchdog timer port */ - "char-major-10-131 wdt", /* /dev/temperature Machine internal temperature */ - /* /dev/hwtrap Hardware fault trap */ -@@ -116,7 +121,11 @@ - "char-major-10-144 nvram", /* from Tigran Aivazian <tigran@sco.COM> */ - "char-major-10-157 applicom", /* from David Woodhouse <dwmw2@infradead.org> */ - "char-major-10-175 agpgart", /* /dev/agpgart GART AGP mapping access */ -+ "char-major-10-181 toshiba", -+ "char-major-10-183 hw_random", - "char-major-10-184 microcode", /* Tigran Aivazian <tigran@veritas.com> */ -+ "char-major-10-187 irnet", -+ "char-major-10-189 ussp", - "char-major-10-200 tun", /* Universal TUN/TAP device driver */ - "char-major-10-250 hci_vhci", - -@@ -179,6 +203,11 @@ - /* next two from <dairiki@matthews.dairiki.org> Thanks! */ - "net-pf-17 af_packet", - "net-pf-19 off", /* acorn econet */ -+ "net-pf-20 atm", -+ "net-pf-23 irda", -+ "net-pf-24 pppoe", -+ "net-pf-25 wanrouter", -+ "net-pf-26 llc", - - "net-pf-31 bluez", - -@@ -199,6 +228,10 @@ - "bt-proto-2 sco", - "bt-proto-3 rfcomm", - "bt-proto-4 bnep", -+ "bt-proto-5 cmtp", -+ "bt-proto-6 hidp", -+ "bt-proto-7 avdtp", -+ - - "plip0 plip", - "plip1 plip", -@@ -228,6 +261,7 @@ - "ppp-compress-21 bsd_comp", - "ppp-compress-24 ppp_deflate", - "ppp-compress-26 ppp_deflate", -+ "ppp ppp_async", /* for 2.4 */ - - #ifndef __sparc__ - "parport_lowlevel parport_pc", -@@ -271,9 +305,6 @@ - */ - char *above[] = - { -- "hid keybdev mousedev", -- "usbmouse hid", -- "wacom evdev", - NULL /* marks the end of the list! */ - }; - -@@ -284,7 +315,6 @@ - */ - char *below[] = - { -- "ov518_decomp ov511", - NULL /* marks the end of the list! */ - }; diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch deleted file mode 100644 index 00cc103257f7..000000000000 --- a/sys-apps/module-init-tools/files/modutils-2.4.27-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -http://bugs.gentoo.org/154281 - ---- util/Makefile.in -+++ util/Makefile.in -@@ -42,7 +42,7 @@ - install-bin: all - - dep depend .depend: $(OBJS:.o=.c) -- $(CC) -M $(CFLAGS) $(DEFS) $^ > .depend -+ $(CC) -M $(CPPFLAGS) $(DEFS) $^ > .depend - - ifeq (.depend,$(wildcard .depend)) - include .depend ---- obj/Makefile.in -+++ obj/Makefile.in -@@ -78,7 +78,7 @@ - install-bin: all - - dep depend .depend: $(LIBOBJ_SRCS) -- $(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend -+ $(CC) -M $(CPPFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend - - ifeq (.depend,$(wildcard .depend)) - include .depend ---- insmod/Makefile.in.orig 2006-11-06 16:10:44.000000000 -0500 -+++ insmod/Makefile.in 2006-11-06 16:10:53.000000000 -0500 -@@ -146,7 +146,7 @@ - rm -f Makefile - - dep depend .depend: $(addsuffix .c, $(PROGS)) -- $(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend -+ $(CC) -M $(CPPFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend - - ifeq (.depend,$(wildcard .depend)) - include .depend diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-flex.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-flex.patch deleted file mode 100644 index c07e929b8b42..000000000000 --- a/sys-apps/module-init-tools/files/modutils-2.4.27-flex.patch +++ /dev/null @@ -1,37 +0,0 @@ -Taken from Debian. - -Build with newer flex versions. - ---- modutils-2.4.27.0.orig/genksyms/lex.l -+++ modutils-2.4.27.0/genksyms/lex.l -@@ -130,6 +130,7 @@ - - static int suppress_type_lookup, dont_want_brace_phrase; - static struct string_list *next_node; -+ static int next_token = 0; - - int token, count = 0; - struct string_list *cur_node; -@@ -144,7 +145,12 @@ - } - - repeat: -- token = yylex1(); -+ if (next_token != 0) { -+ token = next_token; -+ next_token = 0; -+ } -+ else -+ token = yylex1(); - - if (token == 0) - return 0; -@@ -425,7 +431,7 @@ - { - /* Put back the token we just read so's we can find it again - after registering the expression. */ -- unput(token); -+ next_token = token; - - lexstate = ST_NORMAL; - token = EXPRESSION_PHRASE; diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-gcc.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-gcc.patch deleted file mode 100644 index 5193c82e36d9..000000000000 --- a/sys-apps/module-init-tools/files/modutils-2.4.27-gcc.patch +++ /dev/null @@ -1,292 +0,0 @@ -Fix building with newer gcc versions. - -Most changes taken from Debian. - ---- obj/obj_ia64.c -+++ obj/obj_ia64.c -@@ -127,6 +127,7 @@ - return (*(bundle + 1) >> 23) & 0x1ffffffffff; - - default: -+ ; - } - return (-1); - } ---- depmod/depmod.c -+++ depmod/depmod.c -@@ -1133,7 +1133,7 @@ - - for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) { - if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0) -- ((char *)ksym->name) += 8; -+ ksym->name = ((char *)ksym->name) + 8; - assert(n_syms < MAX_MAP_SYM); - symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0); - } -@@ -1265,7 +1265,7 @@ - * error. Use the error() routine but do not count - * any errors. Remove in 2.5. - */ -- int save_errors = errors; -+ int save_errors = error_count; - if (!quiet && nberr == 0) - error("*** Unresolved symbols in %s", - ptmod->name); -@@ -1274,7 +1274,7 @@ - nberr++; - if (flag_unresolved_error) - ret = 1; -- errors = save_errors; -+ error_count = save_errors; - } - } - verbose("%s\n", ptmod->name + skipchars); -@@ -1675,6 +1675,6 @@ - #else - int main(int argc, char **argv) - { -- return depmod_main(argc, argv) || errors; -+ return depmod_main(argc, argv) || error_count; - } - #endif /* defined(COMMON_3264) && defined(ONLY_32) */ ---- genksyms/genksyms.c -+++ genksyms/genksyms.c -@@ -45,7 +45,7 @@ - int flag_debug, flag_dump_defs, flag_warnings; - int checksum_version = 1, kernel_version = version(2,0,0); - --static int errors; -+static int num_errors; - static int nsyms; - - static struct symbol *expansion_trail; -@@ -458,7 +458,7 @@ - va_end(args); - putc('\n', stderr); - -- errors++; -+ num_errors++; - } - } - -@@ -476,7 +476,7 @@ - va_end(args); - putc('\n', stderr); - -- errors++; -+ num_errors++; - } - } - -@@ -597,5 +597,5 @@ - nsyms, HASH_BUCKETS, (double)nsyms / (double)HASH_BUCKETS); - } - -- return errors != 0; -+ return num_errors != 0; - } ---- include/util.h -+++ include/util.h -@@ -39,8 +39,8 @@ - extern int xftw(const char *directory, xftw_func_t); - - /* Error logging */ --extern int log; --extern int errors; -+extern int logging; -+extern int error_count; - extern const char *error_file; - - extern int flag_verbose; ---- insmod/insmod.c -+++ insmod/insmod.c -@@ -275,7 +275,7 @@ - if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) { - gplonly_seen = 1; - if (gpl) -- ((char *)s->name) += 8; -+ s->name = ((char *)s->name) + 8; - else - continue; - } -@@ -1679,7 +1679,7 @@ - error_file = "insmod"; - - /* To handle repeated calls from combined modprobe */ -- errors = optind = 0; -+ error_count = optind = 0; - - /* Process the command line. */ - while ((o = getopt_long(argc, argv, "fhkLmnpqrsSvVxXyYNe:o:O:P:R:", -@@ -2064,7 +2064,7 @@ - goto out; - /**** No symbols or sections to be changed after kallsyms above ***/ - -- if (errors) -+ if (error_count) - goto out; - - /* If we were just checking, we made it. */ -@@ -2123,10 +2123,10 @@ - test_read.m.read_start = m_addr + sizeof(struct module); - test_read.m.read_end = test_read.m.read_start + sizeof(test_read.data); - if (sys_init_module(m_name, (struct module *) &test_read)) { -- int old_errors = errors; -+ int old_errors = error_count; - error("has persistent data but the kernel is too old to support it." - " Expect errors during rmmod as well"); -- errors = old_errors; -+ error_count = old_errors; - } - } - -@@ -2152,7 +2152,7 @@ - #else - init_module(m_name, f, m_size, blob_name, noload, flag_load_map); - #endif -- if (errors) { -+ if (error_count) { - if (!noload) - delete_module(m_name); - goto out; ---- insmod/kallsyms.c -+++ insmod/kallsyms.c -@@ -80,7 +80,7 @@ - error_file = "kallsyms"; - - /* To handle repeated calls from combined modprobe */ -- errors = optind = 0; -+ error_count = optind = 0; - - /* Process the command line. */ - while ((c = getopt_long(argc, argv, "Vh", ---- insmod/modprobe.c -+++ insmod/modprobe.c -@@ -1023,7 +1023,7 @@ - if (quiet) - my_argv[my_argc++] = "-q"; - -- if (log) -+ if (logging) - my_argv[my_argc++] = "-s"; - - if (insmod_opt) { ---- insmod/rmmod.c -+++ insmod/rmmod.c -@@ -261,9 +261,9 @@ - read_parm.m.read_start = mp->sym->value; - read_parm.m.read_end = read_parm.m.read_start + datasize; - if (sys_init_module(module, (struct module *) &read_parm)) { -- int old_errors = errors; -+ int old_errors = error_count; - error("has persistent data but the kernel is too old to support it."); -- errors = old_errors; -+ error_count = old_errors; - return(0); - } - ---- util/logger.c -+++ util/logger.c -@@ -31,10 +31,10 @@ - - /*======================================================================*/ - --int log; -+int logging; - static int silent; - --int errors; -+int error_count; - const char *error_file; - const char *program_name; - -@@ -75,7 +75,7 @@ - - if (silent) - ; -- else if (log) { -+ else if (logging) { - char buf[2*PATH_MAX]; - int n; - -@@ -100,7 +100,7 @@ - putc('\n', stderr); - } - -- errors++; -+ error_count++; - } - - void lprintf(const char *fmt,...) -@@ -108,7 +108,7 @@ - va_list args; - - if (silent); -- else if (log) { -+ else if (logging) { - char buf[2*PATH_MAX]; - va_start(args, fmt); - vsnprintf(buf, sizeof(buf), fmt, args); -@@ -132,5 +132,5 @@ - #ifdef STOREMSG - atexit(dumpmsg); - #endif -- log = 1; -+ logging = 1; - } ---- obj/obj_kallsyms.c -+++ obj/obj_kallsyms.c -@@ -200,8 +200,8 @@ - - /* Initial contents, header + one entry per input section. No strings. */ - osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec); -- a_hdr = (struct kallsyms_header *) osec->contents = -- xmalloc(osec->header.sh_size); -+ osec->contents = xmalloc(osec->header.sh_size); -+ a_hdr = (struct kallsyms_header *) osec->contents; - memset(osec->contents, 0, osec->header.sh_size); - a_hdr->size = sizeof(*a_hdr); - a_hdr->sections = loaded; -@@ -275,8 +275,8 @@ - a_hdr->symbol_off + - a_hdr->symbols*a_hdr->symbol_size + - strings_size - strings_left; -- a_hdr = (struct kallsyms_header *) osec->contents = -- xrealloc(a_hdr, a_hdr->total_size); -+ osec->contents = xrealloc(a_hdr, a_hdr->total_size); -+ a_hdr = (struct kallsyms_header *) osec->contents; - p = (char *)a_hdr + a_hdr->symbol_off; - memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size); - free(symbols); ---- obj/obj_ppc.c -+++ obj/obj_ppc.c -@@ -25,6 +25,7 @@ - #include <obj.h> - #include <util.h> - #include <assert.h> -+#include <stdlib.h> - - - /*======================================================================*/ -@@ -255,7 +256,8 @@ - archdata_sec->header.sh_size = 0; - sec = obj_find_section(f, "__ftr_fixup"); - if (sec) { -- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad)); -+ archdata_sec->contents = xmalloc(sizeof(*ad)); -+ ad = (struct archdata *) (archdata_sec->contents); - memset(ad, 0, sizeof(*ad)); - archdata_sec->header.sh_size = sizeof(*ad); - ad->__start___ftr_fixup = sec->header.sh_addr; ---- obj/obj_mips.c -+++ obj/obj_mips.c -@@ -244,7 +244,8 @@ - archdata_sec->header.sh_size = 0; - sec = obj_find_section(f, "__dbe_table"); - if (sec) { -- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad)); -+ archdata_sec->contents = xmalloc(sizeof(*ad)); -+ ad = (struct archdata *) (archdata_sec->contents); - memset(ad, 0, sizeof(*ad)); - archdata_sec->header.sh_size = sizeof(*ad); - ad->__start___dbe_table = sec->header.sh_addr; diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-hppa.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-hppa.patch deleted file mode 100644 index 30168d3dae12..000000000000 --- a/sys-apps/module-init-tools/files/modutils-2.4.27-hppa.patch +++ /dev/null @@ -1,12 +0,0 @@ -fix support for hppa1.0-unknown-linux-gnu / hppa1.1-unknown-linux-gnu - ---- modutils-2.4.27/configure -+++ modutils-2.4.27/configure -@@ -31,6 +31,7 @@ - powerpc) ARCH=ppc ;; - powerpc64) ARCH=ppc64 ;; - hppa2*) ARCH=hppa64 ;; -+ hppa*) ARCH=hppa ;; - *) ARCH=$host_cpu ;; - esac - diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-no-nested-function.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-no-nested-function.patch deleted file mode 100644 index 7af4599c7154..000000000000 --- a/sys-apps/module-init-tools/files/modutils-2.4.27-no-nested-function.patch +++ /dev/null @@ -1,43 +0,0 @@ -Patch by the PaX team to get rid of executable stacks. - ---- modutils/insmod/insmod.c -+++ modutils/insmod/insmod.c -@@ -366,18 +366,21 @@ static void hide_special_symbols(struct - sym->info = ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info)); - } - -+static struct obj_file *load_map_file; -+ -+static int load_map_cmp(const void *a, const void *b) { -+ struct obj_symbol **as = (struct obj_symbol **) a; -+ struct obj_symbol **bs = (struct obj_symbol **) b; -+ unsigned long aa = obj_symbol_final_value(load_map_file, *as); -+ unsigned long ba = obj_symbol_final_value(load_map_file, *bs); -+ return aa < ba ? -1 : aa > ba ? 1 : 0; -+} -+ - static void print_load_map(struct obj_file *f) - { - struct obj_symbol *sym; - struct obj_symbol **all, **p; - struct obj_section *sec; -- int load_map_cmp(const void *a, const void *b) { -- struct obj_symbol **as = (struct obj_symbol **) a; -- struct obj_symbol **bs = (struct obj_symbol **) b; -- unsigned long aa = obj_symbol_final_value(f, *as); -- unsigned long ba = obj_symbol_final_value(f, *bs); -- return aa < ba ? -1 : aa > ba ? 1 : 0; -- } - int i, nsyms, *loaded; - - /* Report on the section layout. */ -@@ -425,7 +428,9 @@ static void print_load_map(struct obj_fi - *p++ = sym; - - /* Sort them by final value. */ -+ load_map_file = f; - qsort(all, nsyms, sizeof(struct obj_file *), load_map_cmp); -+ load_map_file = NULL; - - /* And list them. */ - lprintf("\nSymbols:"); diff --git a/sys-apps/module-init-tools/module-init-tools-3.10.ebuild b/sys-apps/module-init-tools/module-init-tools-3.10.ebuild deleted file mode 100644 index 8876cc3d5af9..000000000000 --- a/sys-apps/module-init-tools/module-init-tools-3.10.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.10.ebuild,v 1.3 2011/04/24 21:28:11 ulm Exp $ - -inherit eutils - -DESCRIPTION="tools for managing linux kernel modules" -HOMEPAGE="http://modules.wiki.kernel.org/" -SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="" - -DEPEND="sys-libs/zlib - >=sys-apps/baselayout-2.0.1 - !sys-apps/modutils" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.2.2-handle-dupliate-aliases.patch #149426 - touch *.5 *.8 # dont regen manpages -} - -src_compile() { - econf \ - --prefix=/ \ - --enable-zlib \ - --enable-zlib-dynamic \ - --disable-static-utils - emake || die "emake module-init-tools failed" -} - -src_test() { - ./tests/runtests || die -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc AUTHORS ChangeLog NEWS README TODO - - into / - newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die - doman "${FILESDIR}"/update-modules.8 -} - -pkg_postinst() { - # cheat to keep users happy - if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then - sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules - fi -} diff --git a/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild deleted file mode 100644 index f8fba7a9d91f..000000000000 --- a/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.6 2011/04/24 21:28:11 ulm Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="tools for managing linux kernel modules" -HOMEPAGE="http://modules.wiki.kernel.org/" -SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" - -DEPEND="sys-libs/zlib - >=sys-apps/baselayout-2.0.1 - !sys-apps/modutils" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.2.2-handle-dupliate-aliases.patch #149426 - touch *.5 *.8 # dont regen manpages -} - -src_compile() { - mkdir build && cd build #290207 - use static && append-ldflags -static - ECONF_SOURCE=.. \ - econf \ - --prefix=/ \ - --enable-zlib \ - --enable-zlib-dynamic \ - --disable-static-utils - emake || die "emake module-init-tools failed" -} - -src_test() { - ./tests/runtests || die -} - -src_install() { - emake -C build install DESTDIR="${D}" || die - dodoc AUTHORS ChangeLog NEWS README TODO - - into / - newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die - doman "${FILESDIR}"/update-modules.8 -} - -pkg_postinst() { - # cheat to keep users happy - if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then - sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules - fi - - # For files that were upgraded but not renamed via their ebuild to - # have a proper .conf extension, rename them so etc-update tools can - # take care of things. #274942 - local i f cfg - eshopts_push -s nullglob - for f in "${ROOT}"etc/modprobe.d/* ; do - # The .conf files need no upgrading unless a non-.conf exists, - # so skip this until later ... - [[ ${f} == *.conf ]] && continue - # If a .conf doesn't exist, then a package needs updating, or - # the user created it, or it's orphaned. Either way, we don't - # really know, so leave it alone. - [[ ! -f ${f}.conf ]] && continue - - i=0 - while :; do - cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}") - [[ ! -e ${cfg} ]] && break - ((i++)) - done - elog "Updating ${f}; please run 'etc-update'" - mv "${f}.conf" "${cfg}" - mv "${f}" "${f}.conf" - done - # Whine about any non-.conf files that are left - for f in "${ROOT}"etc/modprobe.d/* ; do - [[ ${f} == *.conf ]] && continue - ewarn "The '${f}' file needs to be upgraded to end with a '.conf'." - ewarn "Either upgrade the package that owns it, or manually rename it." - done - eshopts_pop -} diff --git a/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild deleted file mode 100644 index d656a9677436..000000000000 --- a/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.12-r1.ebuild,v 1.13 2012/11/24 21:14:02 ssuominen Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="tools for managing linux kernel modules" -HOMEPAGE="http://modules.wiki.kernel.org/" -SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" -RESTRICT="test" - -DEPEND="sys-libs/zlib - >=sys-apps/baselayout-2.0.1 - !sys-apps/modutils" - -src_unpack() { - unpack ${A} - cd "${S}" - rm -rf tests/build # punt precompiled objects - touch *.5 *.8 # dont regen manpages -} - -src_compile() { - mkdir build && cd build #290207 - use static && append-ldflags -static - ECONF_SOURCE=.. \ - econf \ - --prefix=/ \ - --enable-zlib \ - --enable-zlib-dynamic \ - --disable-static-utils - emake || die -} - -src_test() { - # this manually runs configure and stuff, so ignore it - ./tests/runtests -v || die -} - -src_install() { - emake -C build install DESTDIR="${D}" || die - dodoc AUTHORS ChangeLog NEWS README TODO - - into / - newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die - doman "${FILESDIR}"/update-modules.8 || die - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd \$CMDLINE_OPTS - install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS - EOF - - insinto /etc/modprobe.d - doins "${T}"/usb-load-ehci-first.conf || die #260139 -} - -pkg_postinst() { - # cheat to keep users happy - if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then - sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules - fi - - # For files that were upgraded but not renamed via their ebuild to - # have a proper .conf extension, rename them so etc-update tools can - # take care of things. #274942 - local i f cfg - eshopts_push -s nullglob - for f in "${ROOT}"etc/modprobe.d/* ; do - # The .conf files need no upgrading unless a non-.conf exists, - # so skip this until later ... - [[ ${f} == *.conf ]] && continue - # If a .conf doesn't exist, then a package needs updating, or - # the user created it, or it's orphaned. Either way, we don't - # really know, so leave it alone. - [[ ! -f ${f}.conf ]] && continue - - i=0 - while :; do - cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}") - [[ ! -e ${cfg} ]] && break - ((i++)) - done - elog "Updating ${f}; please run 'etc-update'" - mv "${f}.conf" "${cfg}" - mv "${f}" "${f}.conf" - done - # Whine about any non-.conf files that are left - for f in "${ROOT}"etc/modprobe.d/* ; do - [[ ${f} == *.conf ]] && continue - ewarn "The '${f}' file needs to be upgraded to end with a '.conf'." - ewarn "Either upgrade the package that owns it, or manually rename it." - done - eshopts_pop -} diff --git a/sys-apps/module-init-tools/module-init-tools-3.13.ebuild b/sys-apps/module-init-tools/module-init-tools-3.13.ebuild deleted file mode 100644 index b86bc7633928..000000000000 --- a/sys-apps/module-init-tools/module-init-tools-3.13.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.13.ebuild,v 1.1 2011/06/01 15:00:31 vapier Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="tools for managing linux kernel modules" -HOMEPAGE="http://modules.wiki.kernel.org/" -SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" -RESTRICT="test" - -DEPEND="sys-libs/zlib - !<sys-apps/baselayout-2.0.1 - !sys-apps/modutils" - -src_unpack() { - unpack ${A} - cd "${S}" - rm -rf tests/build # punt precompiled objects - touch *.5 *.8 # dont regen manpages -} - -src_compile() { - mkdir build && cd build #290207 - use static && append-ldflags -static - ECONF_SOURCE=.. \ - econf \ - --prefix=/ \ - --enable-zlib \ - --enable-zlib-dynamic \ - --disable-static-utils - emake || die -} - -src_test() { - # this manually runs configure and stuff, so ignore it - ./tests/runtests -v || die -} - -src_install() { - emake -C build install DESTDIR="${D}" || die - dodoc AUTHORS ChangeLog NEWS README TODO - - into / - newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die - doman "${FILESDIR}"/update-modules.8 || die - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd \$CMDLINE_OPTS - install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS - EOF - - insinto /etc/modprobe.d - doins "${T}"/usb-load-ehci-first.conf || die #260139 -} - -pkg_postinst() { - # cheat to keep users happy - if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then - sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules - fi - - # For files that were upgraded but not renamed via their ebuild to - # have a proper .conf extension, rename them so etc-update tools can - # take care of things. #274942 - local i f cfg - eshopts_push -s nullglob - for f in "${ROOT}"etc/modprobe.d/* ; do - # The .conf files need no upgrading unless a non-.conf exists, - # so skip this until later ... - [[ ${f} == *.conf ]] && continue - # If a .conf doesn't exist, then a package needs updating, or - # the user created it, or it's orphaned. Either way, we don't - # really know, so leave it alone. - [[ ! -f ${f}.conf ]] && continue - - i=0 - while :; do - cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}") - [[ ! -e ${cfg} ]] && break - ((i++)) - done - elog "Updating ${f}; please run 'etc-update'" - mv "${f}.conf" "${cfg}" - mv "${f}" "${f}.conf" - done - # Whine about any non-.conf files that are left - for f in "${ROOT}"etc/modprobe.d/* ; do - [[ ${f} == *.conf ]] && continue - ewarn "The '${f}' file needs to be upgraded to end with a '.conf'." - ewarn "Either upgrade the package that owns it, or manually rename it." - done - eshopts_pop -} diff --git a/sys-apps/module-init-tools/module-init-tools-3.6-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.6-r1.ebuild deleted file mode 100644 index 7c1add578fe2..000000000000 --- a/sys-apps/module-init-tools/module-init-tools-3.6-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.6-r1.ebuild,v 1.3 2011/04/24 21:28:11 ulm Exp $ - -inherit flag-o-matic eutils toolchain-funcs fixheadtails - -MODUTILS_PV="2.4.27" - -MY_P="${P/_pre/-pre}" -DESCRIPTION="tools for managing linux kernel modules" -HOMEPAGE="http://modules.wiki.kernel.org/" -SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${MY_P}.tar.bz2 - old-linux? ( mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2 ) - mirror://gentoo/${MY_P}-man.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="old-linux" -# The test code runs `make clean && configure` and screws up src_compile() -RESTRICT="test" - -DEPEND="sys-libs/zlib - >=sys-apps/baselayout-1.12.7-r2 - !sys-apps/modutils" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - - # Patches for old modutils - if use old-linux ; then - cd "${WORKDIR}"/modutils-${MODUTILS_PV} - epatch "${FILESDIR}"/modutils-2.4.27-alias.patch - epatch "${FILESDIR}"/modutils-2.4.27-gcc.patch - epatch "${FILESDIR}"/modutils-2.4.27-flex.patch - epatch "${FILESDIR}"/modutils-2.4.27-no-nested-function.patch - epatch "${FILESDIR}"/modutils-2.4.27-hppa.patch - epatch "${FILESDIR}"/modutils-2.4.27-build.patch #154281 - fi - - # Fixes for new module-init-tools - cd "${S}" - ht_fix_file tests/test-depmod/10badcommand.sh - # Test fails due since it needs to write to /lib/modules so disable it - rm -f tests/test-depmod/01backcompat.sh - - # Fix bug 49926: This patch allows generate-modprobe.conf to - # accept the --assume-kernel=x.x.x option for generating livecds. - # This is a companion to a patch in baselayout-1.9.0 which allows - # the same flag to modules-update. - epatch "${FILESDIR}"/${PN}-3.1_generate-modprobe-assume-kernel.patch - - # Abort if we fail to run modprobe, bug #68689 - epatch "${FILESDIR}"/${PN}-3.2_pre7-abort-on-modprobe-failure.patch - epatch "${FILESDIR}"/${PN}-3.2.2-handle-dupliate-aliases.patch #149426 - epatch "${FILESDIR}"/${PN}-3.6-hidden-dirs.patch #245271 - epatch "${FILESDIR}"/${P}-skip-sys-check.patch #258442 - - # make sure we link dynamically with zlib; our zlib.so is in /lib vs - # /usr/lib so it's safe to link with. fixes ugly textrels as well. - sed -i \ - -e 's:-Wl,-Bstatic -lz -Wl,-Bdynamic:-lz:' \ - configure || die - - # make sure we don't try to regen the manpages - touch *.5 *.8 -} - -src_compile() { - # Configure script uses BUILDCFLAGS for cross-compiles but this - # defaults to CFLAGS which can be bad mojo - export BUILDCFLAGS=-pipe - export BUILDCC=$(tc-getBUILD_CC) - - if use old-linux ; then - einfo "Building modutils ..." - cd "${WORKDIR}"/modutils-${MODUTILS_PV} - econf \ - --disable-strip \ - --prefix=/ \ - --enable-insmod-static \ - --disable-zlib \ - || die "econf failed" - emake || die "emake modutils failed" - - einfo "Building module-init-tools ..." - cd "${S}" - fi - - econf \ - --prefix=/ \ - --enable-zlib \ - || die "econf failed" - emake || die "emake module-init-tools failed" -} - -modutils_src_install() { - cd "${WORKDIR}"/modutils-${MODUTILS_PV} - einstall prefix="${D}" || die - docinto modutils-${MODUTILS_PV} - dodoc CREDITS ChangeLog NEWS README TODO - - # remove man pages provided by the man-pages package now #124127 - rm -r "${D}"/usr/share/man/man2 - - cd "${S}" - # This copies the old version of modutils to *.old so it still works - # with kernels <= 2.4; new versions will execve() the .old version if - # a 2.4 kernel is running... - # This code was borrowed from the module-init-tools Makefile - local runme f - for f in lsmod modprobe rmmod depmod insmod insmod.static modinfo ; do - if [[ -L ${D}/sbin/${f} ]] ; then - einfo "Moving symlink $f to ${f}.old" - #runme = the target of the symlink with a .old tagged on. - runme=$(ls -l "${D}"/sbin/${f} | sed 's/.* -> //').old - [[ ! -e ${D}/sbin/${runme} ]] || einfo "${D}/sbin/${runme} not found" - dosym ${runme} /sbin/${f} || die - elif [[ -e ${D}/sbin/${f} ]] ; then - einfo "Moving executable $f to ${f}.old" - fi - mv -f "${D}"/sbin/${f} "${D}"/sbin/${f}.old - done - # Move the man pages as well. We only do this for the man pages of the - # tools that module-init-tools will replace. - for f in "${D}"/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8 - do - mv -f ${f} ${f%\.*}.old.${f##*\.} - done - # Fix the ksyms links #35601 - for f in ksyms kallsyms ; do - dosym insmod.old /sbin/${f} - dosym insmod.static.old /sbin/${f}.static - done -} - -src_install() { - use old-linux && modutils_src_install - - cd "${S}" - emake install DESTDIR="${D}" || die - dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5 - - # Install compat symlink - dosym ../bin/lsmod /sbin/lsmod - use old-linux && dosym ../sbin/insmod.old /bin/lsmod.old - # Install the modules.conf2modprobe.conf tool, so we can update - # modprobe.conf. - into / - dosbin "${S}"/generate-modprobe.conf || die - newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die - doman "${FILESDIR}"/update-modules.8 - - doman *.[1-8] - docinto / - dodoc AUTHORS ChangeLog INSTALL NEWS README TODO -} - -pkg_postinst() { - # cheat to keep users happy - if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then - sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules - fi -} |