diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-07-31 04:43:39 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-07-31 04:43:39 +0000 |
| commit | 697b2148ece3eda1a5fc939a5cf749de6c33d74e (patch) | |
| tree | fc0597cff8be46ed0423179e2765987644d5aeec /sys-fs | |
| parent | Stable ppc64, bug #393757 (diff) | |
| download | historical-697b2148ece3eda1a5fc939a5cf749de6c33d74e.tar.gz historical-697b2148ece3eda1a5fc939a5cf749de6c33d74e.tar.bz2 historical-697b2148ece3eda1a5fc939a5cf749de6c33d74e.zip | |
Tarball rest of the legacy files to mirrors.
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
45 files changed, 94 insertions, 2634 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 67606b81279c..e1c07059cf29 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,29 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.699 2012/07/30 22:41:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.700 2012/07/31 04:43:38 ssuominen Exp $ + + 31 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> + -files/move_tmp_persistent_rules-112-r1.sh, -files/136/udev.confd, + -files/147/udev.confd, -files/write_root_link_rule-125, + -files/136/udev.initd, -files/147/udev.initd, -files/net-130-r1.sh, + -files/136/shell-compat-KV.sh, -files/136/udev-dev-tarball.initd, + -files/147/udev-mount.initd, -files/udev-141-remove-devfs-names.diff, + -files/136/udev-mount.initd, -files/147/udev-postmount.initd, + -files/blacklist-146, -files/136/udev-postmount.initd, + -files/147/udev-start.sh, -files/udev-150-fix-missing-firmware-timeout.diff, + -files/136/shell-compat-addon.sh, -files/136/udev-start.sh, + -files/147/udev-stop.sh, -files/udev-151-readd-hd-rules.diff, + -files/136/udev-stop.sh, -files/151-r4/shell-compat-KV.sh, + -files/udev-164-remove-v4l1.patch, -files/147/shell-compat-KV.sh, + -files/147/shell-compat-addon.sh, -files/147/udev-dev-tarball.initd, + -files/151-r4/shell-compat-addon.sh, -files/151-r4/udev.confd, + -files/151-r4/udev-dev-tarball.initd, udev-146-r1.ebuild, + -files/151-r4/udev-mount.initd, udev-151-r4.ebuild, -files/151-r4/udev.initd, + -files/151-r4/udev-postmount.initd, -files/151-r4/udev-start.sh, + udev-149.ebuild, udev-164-r2.ebuild, -files/151-r4/udev-stop.sh, + udev-141-r1.ebuild, udev-171-r6.ebuild, -files/pnp-aliases, + -files/shell-compat-KV.sh: + Tarball rest of the legacy files to mirrors. 30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> -files/blacklist-110, udev-141-r1.ebuild: diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index ac07f93841f4..d769b33faa22 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,44 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 136/shell-compat-KV.sh 1012 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b SHA512 39ec9f2cb71158abf73355d131f30df7d7dd93f0348bba4eac8780792634812473b51a4e93386bd011fc7c69964d2c560862fbf7cbfae9ca91b003ed5f37f6a1 WHIRLPOOL e70c3966ba2319f04406eb6bb569ce9db6fcb100d74a0151914e216156b29488384ef89eeb81150dbe06d6e7b556f45888ec10743fac561c72b688b7b78cf707 -AUX 136/shell-compat-addon.sh 930 SHA256 94b1fe1f5ba892c82798cec6f15b5c5c76e1902ef2d13701ddfbb54f19079af9 SHA512 733106267086997955a02c654807ce0d17f0aef32b6b8660b0ba71c3b58b18bdbb86721082be6b1a4cdce11883565397d4264b7e59cf71c4eb7a2862c91ad183 WHIRLPOOL 4d7c64c6e60b144e2888fb7ed1671cb2d86854017a37091047a10e994e21be9fbb4130a0925d29edc945b1aa0e35c51e137f3deac59f5d63127d43c33f2fa9ac -AUX 136/udev-dev-tarball.initd 2579 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60 SHA512 c5567723ff11a696123a80a2d7f44157e63423ddcece2fe255ed658c8d56e10593486448e357d7e2d521e5f0beb77921111cb5bcd166f25fa5890cab2d8508f8 WHIRLPOOL 3a6b269a21b8195f99633e08564a6d5060224b8150eb815f1f460e37e6780fcec22dac702dfd0cd4990797478b494ff6a573c16425737a8b9e1fad726b7cd677 -AUX 136/udev-mount.initd 2706 SHA256 b35cd8ac15b4db70ed4882a2c5f3823fad5983b8ecb3b45a9977a6e45b62d2a7 SHA512 0adda486617fff27f648e1ee0e7f95f9c322902c581fa99d2931dd3414b9e0193e126f2427a2a52bed5691ac9f5c0f64bafb826ebe2ce7bbc0065fbba975f2ee WHIRLPOOL 245b61ee0f704580a4a25190b300f5c75ec30b7c7685286757fb9e4316a6ce8b429b0ca6cdfdd9b8b6f25233e590b7e47a02b9739396db2f832020a859d5b9dc -AUX 136/udev-postmount.initd 683 SHA256 14094a6f8ff2644cab9b20e52e339f002ecaf35a2cb6565d972030a4e43cb3ca SHA512 5847f8a9ec9444a169697a88cd829ea5d3892cd46343a55d81b18c241c5f8465d4cfba037aebb1ce4745a0112b9a3b3c7b73e423caeb6d385307ed18d7d8424d WHIRLPOOL 4d3fbd4525be701106cd150eab0e671e1c898e853972aaf4d259623b8b945e144e0d1b36c79470e3c3a12df6cfb8e606a90c5d57c6873c13fabf0edcb49411a7 -AUX 136/udev-start.sh 1345 SHA256 5a56cb63ab5fec4f5393eca944d734bab1373bc2a75dcee6b202f86570541414 SHA512 cc1e7a409378f1d269c36d0821564222295cbb9a8397850bcca78d7bbf5de504748b8ceaf50729dec3f1dad8a2aa57a8854ac6afbe7e444ea035c232551754c0 WHIRLPOOL 3249487a6e0dc2c4378b93ce817dcc8e9e80ef87aa72994a19b25f5884f15946051e9644c189e3f5871f57e64a7810c1b71fc00108a6c1e4c7bbe1b57d2826b7 -AUX 136/udev-stop.sh 237 SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c233d3a5e48a6c1d20a1d SHA512 670da2a39635f07b588ed9e9a390b94985d646b267931c1c42211f037b3adac256e245c82cd2f8f0411204b64babef7a80bd7c21d9dcfc6eb9e48492336b15f0 WHIRLPOOL ae283428a3f7b0fbc289d3d2540dff24c03e4d7089ddf42ac5177f1e94fd2b53f3c6ab3ed82de3d89f3b89eb85d00a64cfeda53fd57d1d17e7d5ea35321d967f -AUX 136/udev.confd 1764 SHA256 6918ce2ad61a7998088e1628e5bd1b59a9082cdb89dc23b1385f641d8a59cdb6 SHA512 8ed590012135eeb5d40b45a6c8d3c233646c7c28292e1e87b6585ad62b0c599776f01cd82f2f8766c672d93abe00c06af45d465ca4d2894a16a2482456619d11 WHIRLPOOL 065b2c48081499f7317c7a0a21721f759b4496fed4bdee93af4c8a3347210ccb801cdff022d2f218ab766d81431356e8e3f20d428afafc2bfac7691c928d4dc3 -AUX 136/udev.initd 5799 SHA256 615d4d8c4e806f89bb94348f9959c1e034447485ac313b41af2e05d384eb991e SHA512 01870904513d43e7f27d78f06ee23ad09de98794a59bda69b458756894bce017f9e0dee01355bb3432d6a300906693bf040fa0acf936ba9aa4f3d64dd49696d7 WHIRLPOOL 7fa3597da24d43e12b00fb00273b8fbed2c3637b3f0e39c684f3a51b2721a4c804279c3f094ca836a21cc85425b92761ccb21c9dc8819f588203a4fed1549cd7 -AUX 147/shell-compat-KV.sh 1012 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b SHA512 39ec9f2cb71158abf73355d131f30df7d7dd93f0348bba4eac8780792634812473b51a4e93386bd011fc7c69964d2c560862fbf7cbfae9ca91b003ed5f37f6a1 WHIRLPOOL e70c3966ba2319f04406eb6bb569ce9db6fcb100d74a0151914e216156b29488384ef89eeb81150dbe06d6e7b556f45888ec10743fac561c72b688b7b78cf707 -AUX 147/shell-compat-addon.sh 1706 SHA256 481eb655c58cbb65163a2ac58022b730d1e720d4066273358627a4fe98c52a1f SHA512 1a97921d4f8465bb83dbff0de372dbb034d31a718f3b7fcd87cdb874d649cfd8c595be00297ee0f6d816738d1439d4f6bf208e0f5059b89894e8a2ba04f857a4 WHIRLPOOL e60565ba8de2f291b049f8d1e3f2cb4cfee458e3fc340f5b849a944c9ade59149b7a64b4f9accc86a9f768f4908f409a476a220f4f9140363880afb79dfea10c -AUX 147/udev-dev-tarball.initd 2579 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60 SHA512 c5567723ff11a696123a80a2d7f44157e63423ddcece2fe255ed658c8d56e10593486448e357d7e2d521e5f0beb77921111cb5bcd166f25fa5890cab2d8508f8 WHIRLPOOL 3a6b269a21b8195f99633e08564a6d5060224b8150eb815f1f460e37e6780fcec22dac702dfd0cd4990797478b494ff6a573c16425737a8b9e1fad726b7cd677 -AUX 147/udev-mount.initd 2889 SHA256 d8d21b393b5bcc6069baa9eb52ec073d265c8cd75d7ffa87828fe98b9c693fbc SHA512 275651dbc8adc03ca80f3327aba2c54994af64f7c3fa8149cb83ece6d8debc9bda5e651608235f3e775ceaef3a4934d9e31faf37e2a3f69a9f8134d37a014c2f WHIRLPOOL e3459019454d8457e29cc7d2cf5f1cb4007a9e13c44663b6e135c0566e607acfac28c2383b9eb8a81e6cc2081f08ced0de28bbb20f215033e5e940bd193cb0c8 -AUX 147/udev-postmount.initd 803 SHA256 c3d74922672363f6fe7e2caa2f349448b060ee491eaea2cdefae44800297caa8 SHA512 9a4619cd15d7f412d67fdab6d3d750a608257b22274d430165c8b3fbff7a256700b16f2b945906f535105d15963d51f06e0b82860fa2a72169163a2405769b1d WHIRLPOOL 0ed89f97d28e8d7229c9e27b1b717b7ecd11e4111dd3c2d0982818f266865c1ab0501633a43008daaf0dbac5b81f7918c60fed002c2a3d1061390d94a618f217 -AUX 147/udev-start.sh 1355 SHA256 2721826100e6180d0f76c3a15b14fe0c7d2d09af3dc16f88ceeca312abf1abb6 SHA512 e31819be668dd75ee09cf1a2d2057ca7666f416a9209e45610d75b630fa2c4253bb298796d9a34ee202cf343c64b5fca4d78838054e7bc0905bc7532f9722ce8 WHIRLPOOL 8a1ceed8acf08f1590fff48fde770d6f13f0a8ab53be5b9440d85f2085427fba9e0090c1191cc6fe197efac1886435c28ed2379e921c57cbc519ea42473ba968 -AUX 147/udev-stop.sh 237 SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c233d3a5e48a6c1d20a1d SHA512 670da2a39635f07b588ed9e9a390b94985d646b267931c1c42211f037b3adac256e245c82cd2f8f0411204b64babef7a80bd7c21d9dcfc6eb9e48492336b15f0 WHIRLPOOL ae283428a3f7b0fbc289d3d2540dff24c03e4d7089ddf42ac5177f1e94fd2b53f3c6ab3ed82de3d89f3b89eb85d00a64cfeda53fd57d1d17e7d5ea35321d967f -AUX 147/udev.confd 1764 SHA256 6918ce2ad61a7998088e1628e5bd1b59a9082cdb89dc23b1385f641d8a59cdb6 SHA512 8ed590012135eeb5d40b45a6c8d3c233646c7c28292e1e87b6585ad62b0c599776f01cd82f2f8766c672d93abe00c06af45d465ca4d2894a16a2482456619d11 WHIRLPOOL 065b2c48081499f7317c7a0a21721f759b4496fed4bdee93af4c8a3347210ccb801cdff022d2f218ab766d81431356e8e3f20d428afafc2bfac7691c928d4dc3 -AUX 147/udev.initd 6382 SHA256 60a27b041ddb1b69c81b20bfa92df14780fd99fe97edd60c0a178da14c181517 SHA512 ca0edfca5a1f4d51b7edbad1645e6432a374c9c333aba231bebb8a7ab7bb5f79fc76399259fcd6ecef9144d051a0bf94853fa2176534591048ba26def21b3eb9 WHIRLPOOL cacd3481acf446b27ef357cfa49e178071ad588e12ac697c155155d31a56deb420df6cc083959a9c31486af023f712a7d35d47a6e1226745e5b0f4513b79b059 -AUX 151-r4/shell-compat-KV.sh 1012 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b SHA512 39ec9f2cb71158abf73355d131f30df7d7dd93f0348bba4eac8780792634812473b51a4e93386bd011fc7c69964d2c560862fbf7cbfae9ca91b003ed5f37f6a1 WHIRLPOOL e70c3966ba2319f04406eb6bb569ce9db6fcb100d74a0151914e216156b29488384ef89eeb81150dbe06d6e7b556f45888ec10743fac561c72b688b7b78cf707 -AUX 151-r4/shell-compat-addon.sh 1706 SHA256 481eb655c58cbb65163a2ac58022b730d1e720d4066273358627a4fe98c52a1f SHA512 1a97921d4f8465bb83dbff0de372dbb034d31a718f3b7fcd87cdb874d649cfd8c595be00297ee0f6d816738d1439d4f6bf208e0f5059b89894e8a2ba04f857a4 WHIRLPOOL e60565ba8de2f291b049f8d1e3f2cb4cfee458e3fc340f5b849a944c9ade59149b7a64b4f9accc86a9f768f4908f409a476a220f4f9140363880afb79dfea10c -AUX 151-r4/udev-dev-tarball.initd 2579 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60 SHA512 c5567723ff11a696123a80a2d7f44157e63423ddcece2fe255ed658c8d56e10593486448e357d7e2d521e5f0beb77921111cb5bcd166f25fa5890cab2d8508f8 WHIRLPOOL 3a6b269a21b8195f99633e08564a6d5060224b8150eb815f1f460e37e6780fcec22dac702dfd0cd4990797478b494ff6a573c16425737a8b9e1fad726b7cd677 -AUX 151-r4/udev-mount.initd 3027 SHA256 12d79f025cd55feda9510fe9097fdcd90fc6096f19e03b495ab0f6b8566c3ec4 SHA512 79d5f2448a89af49d49d2757be9d3b58a801bc9b73884bce574a2b98926c687f136b42ef5a4b058502a66022b27e16516b8054c4566e57c41ff534f6b111764a WHIRLPOOL 506641c7518a2808284cea5b07b7151c54205103326d13b13e9e7d781ebaf4d428cc1cc00996654d451d2e985fd3e8eecb354f0d173744e4f62ad3a9f8cc9b71 -AUX 151-r4/udev-postmount.initd 806 SHA256 a7ab507f285a058c9cde2f96dc0aa2bb77db3f94897a4ba21b42404dc6606267 SHA512 851857df576837ad67f49bdea2ad73e798e148739cbd5c2e184f52511900b6520cbcd1ea8a777ebc6db1934259696c5470ec711356d18da5c9198935428df563 WHIRLPOOL 2b6f2e26b29403d4349a3f1b5e2d76aeee62fef54667a07ebecc02c5c6c3172c1f983ea6c6cdc386c20fcd40139a9e2a99c14c3070a1f7b5dc2fc0b30500f414 -AUX 151-r4/udev-start.sh 1355 SHA256 2721826100e6180d0f76c3a15b14fe0c7d2d09af3dc16f88ceeca312abf1abb6 SHA512 e31819be668dd75ee09cf1a2d2057ca7666f416a9209e45610d75b630fa2c4253bb298796d9a34ee202cf343c64b5fca4d78838054e7bc0905bc7532f9722ce8 WHIRLPOOL 8a1ceed8acf08f1590fff48fde770d6f13f0a8ab53be5b9440d85f2085427fba9e0090c1191cc6fe197efac1886435c28ed2379e921c57cbc519ea42473ba968 -AUX 151-r4/udev-stop.sh 237 SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c233d3a5e48a6c1d20a1d SHA512 670da2a39635f07b588ed9e9a390b94985d646b267931c1c42211f037b3adac256e245c82cd2f8f0411204b64babef7a80bd7c21d9dcfc6eb9e48492336b15f0 WHIRLPOOL ae283428a3f7b0fbc289d3d2540dff24c03e4d7089ddf42ac5177f1e94fd2b53f3c6ab3ed82de3d89f3b89eb85d00a64cfeda53fd57d1d17e7d5ea35321d967f -AUX 151-r4/udev.confd 2002 SHA256 b797379b93d03accf9d8b65f0c4a2f26de1c634c8ba7846f3238dea9211aa153 SHA512 cf93c549345e952d9cceb42f40979e3f5f6790506b60385b50295f18b833c83e5cda6dfbd6f019d68e9ab86bcd398cc0c26e48ce6035075b23cbd9d42794177f WHIRLPOOL b85e8a128027569a32304f844d0981a05050265ebef1ffb10c74c5e645a22f6b12234cffc73d2fcc741c58ecfe4cc4573704eff65bb692628dcc9dffe68b4187 -AUX 151-r4/udev.initd 6719 SHA256 f10b0a19e29f4a78f68d30454549010f680ed64140fcd3bccb6e0788ff489818 SHA512 c6a23312bd23ce5e11e53c1f96c1e403279195000043d9f11db1b77e0e4416e52b66210250252a4392c582265fec74d21d7b7107958744dd4b765b3a3ed7ddbd WHIRLPOOL 15d0c9073ad519ac739cad04d026176a27f4d3de7610f694bdc51758dd9a14580ab3777881b3c01b930b361e6f8860ddee584617f3624699a6a3988753db15fb AUX 40-gentoo.rules 349 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea SHA512 b8d90037c08f30c9fb9e22a43c59a3627c218313b0421d4b70feba1731cda76ddc4ee6bdb99dca8df61e11f8d656a8769e172f0a584d7620213973dacfbbb4aa WHIRLPOOL a4086cd5f0e8849369389aa29ec42f5d906b00e3d650724d38ff8b4df4e36de7d3a37393b14f2f30a7102d6f2859b6847b5f4b7813be12d945ce1515494ce120 -AUX blacklist-146 950 SHA256 12d60698be657c9c5b40c8cb6c3649d02f8d8c8f05d63dab7c8bee0a30c339c4 SHA512 38a18a804c9d716a8ee49377273d749f4c97af15d3768813ab1d2977b3ae8c5715f5179872b4ed4ae95104a6f28bf9644f63ff15e4ef89f942b3651bf5f66555 WHIRLPOOL f437ceee332175afab91ff6c01fa2a7d3a0a49ead9837435a083d5622e654d93ba4eef2719267613c3af7815847c587194ef5e7697afba82a56a80b69612f91d -AUX move_tmp_persistent_rules-112-r1.sh 646 SHA256 d5dcbb9a13223633e9c4ac8b4eb26ddb38b55af7ea0eec9e512eb47475a07400 SHA512 b8c4a906c4139f91c108064ab7502d675dd9f509fe86e5cc577a187c0549060dc67eae1fd451c6a83e5c9293fdc8a047fe5f983f60d6eda2f9b36cd10f3dc72c WHIRLPOOL b1035dd9f7cf40fa04a4b37f7ee318dfb78f776099c4bd4413439a29dbf6f7c597d4780c628ce509ec672765b050bf5ab7bba4346475715d6ead50fbdff99976 -AUX net-130-r1.sh 865 SHA256 54897b58aba92d9765e8da4349ad777f9d8328bf94922d28cb3210ee0664a6a4 SHA512 23462c0e83094c4e0aaa33f5613b914b69a73328696513c80469914b498971bb6c3ab0e54913552994433c1bd611449cb545b3cb0f232a9f480210ccd39952ea WHIRLPOOL 5527733d1c4d3864f4fb027e312186efdde780847ef4bbb87dd819dded6d76ff073a1af35660acf558ccc42057d581ac1edd6bf02681185454e83e7c733a307a -AUX pnp-aliases 537 SHA256 690b32a166d060c1c663030c51d5b2298eb9d314c8cef737373e0b16ed751e99 SHA512 8f03588c886fbbc3b25781df5d91e4d9fadf526ba9723ce28a6bb9307e5146a8b0271c3871c41a14cda30d50791f2b994a9e90f1d09a49b731b44624d30b0f49 WHIRLPOOL a58501ade52e5628afec06941fc9e89054a2345f3165e60fbf10b53c710f036a31cd95f8c596bd3f7173d9eda74b72fb91f0be464212afa207f23c71e6385848 -AUX shell-compat-KV.sh 1076 SHA256 4a8e1c8cba58676f44bc24e1635df5a64e841f04f95406c4647fe5833dce8ce5 SHA512 6a47756eabaa61b73a22e1753fa11ffe1b3b08d61731a559bb50a89196ea75151a7030d998912cde8ec0d8fd60ee32d3a1d8eefc14c246701266dbfa19349a17 WHIRLPOOL eda32edcfa4a18e33c80b39f1741973a4a7b58ead91ca6c5a0998299d7f27e478f46b640aeb7b113e189e020f9f548a6c7b06a6a7f080bd26ae57db87390739a -AUX udev-141-remove-devfs-names.diff 557 SHA256 9d1d64b41a6ff423fb218a36c56cbdec2d79827741060f39aed2f8ce2d03693f SHA512 8f4745da2a7ff4ecfdbb19902eaf03bcb5499f88e9e4ae81013d352668cb4dc42f504974a80ba1c59a1b26f4a13e0ca8085f306517265ebca80d758d41708b70 WHIRLPOOL d3c6f8ced6d581394a43e630c6e0c03d69b6dd4b59dd4d7fb62c305eca18e2fce8433bcb6c522a0c97832d7864808aa9e422406eb9d89cb84173bd60c08572dd -AUX udev-150-fix-missing-firmware-timeout.diff 1065 SHA256 863f394783ac282a3d83eb84ff0ed0f5dd7982e1b40d10e1081c567f38825371 SHA512 d8428c94d77d0d6cd330041fbb517cccec3d0b497ff1393e714404f69cedbd82ed3da8e3c2ff9f96c8000706c9d8f1db3d6689a44971784d8fad452ff95fac95 WHIRLPOOL 9aa3898685f553239fab0ca7714c472b9a8b1b43ceb9e9f7619f393a7f439be73c83e0873ca29675b365ea54e27e86111e26c09c72e8e3993da552a04634022c -AUX udev-151-readd-hd-rules.diff 2759 SHA256 47eb3b3dd8c8c3199148aa083a47b2cbd29953b647b6ed06391424a353e6d39c SHA512 194e0830fb3518345a1470a04e09b6fecd38d4c055cb2bbffd2476f7b6e0b11ffb3dcd6fb821dcdd22ecbf027b8ce8e21c33468f5afdd901d26879150fca5087 WHIRLPOOL d04f7d1cf5e38262985c85ae82e2e34f90adb2974f6710f36b110fa0e5a7e8ecc65d3f07662486c0b07c534bec558a3ec2c6ebcc2b02dcde71807c1d5d32f530 -AUX udev-164-remove-v4l1.patch 1263 SHA256 df8a13ea471f40383438aa5133465f580841e5cd7a95aedc090d85f7389a6403 SHA512 93109083467d667c7c945d5a9375d9c82a135ff9c5a154f5494d42c791cec2a4e1aa2c9ecc6af337b0d87ca17e532e149cfd002ac3e18c7667a38ea182ae85c5 WHIRLPOOL e37b9f154fb9f1d91672a9215d0d627c019889d662d4b57e00e52feae506b5452054dc816249a847052f2bcfcf8112f8bab9a77da33ad3a9cd06dd181abf523c -AUX write_root_link_rule-125 1086 SHA256 f8cff0e73ef40c6a9f642aba35136eac6e60d4cdfb54027aad59f6b770c01915 SHA512 f3dc810e41e8123a1004108afb98406aa7f44cb69072a6deb0dce75ed2de1d79304b3cbfc38ca3c3d7289db6695f65f3c87162c83f87a2052b404e901a344703 WHIRLPOOL 56dd647ba7dfe24d0ed9867dfce5e26016a58dc0057d8de283234f0714d576b7c6aa1e6e79832c3f25f20b5ef0af59f88241bb0576da97c89ccb3f55d0dbcf46 DIST systemd-186.tar.xz 1296836 SHA256 b2c201f501952e52241827f01541de7ee05c1238fc39bfe97065f5a04e46b27e SHA512 1cc1ce7776e28b7b8eb1108d911c22f147ee4b8352728e5d0689bb209a43cff138fdc76d7368fe71a959182571e4d4576c1a263b28405170dd275c29b1592d54 WHIRLPOOL b476afcfe802d4857d8d214bb9c619384ff85aef6bf03dcc78f0bd521805a3b50bf82e4580862046b10dd63b7c5e77ff4e6bd802f5dc4850c09f92b111785128 DIST udev-141.tar.bz2 448373 SHA256 51e0128c3fc29971d978050839fd59f103fddae4a47c8fd2b36f2836cfb59d35 SHA512 d039792eb19c639636c221857f8901dd1fc24ead8da2927d10ce48e3acd22a883d55c48cf66f3a0ab396dd89e46bd7d96a8f345e6d1b9f6592711fd254ffad05 WHIRLPOOL 3806087eb04e54dfc51bca96621eaab56aee4244bf60d1bf4eec9731e4e648e1602ba98f67b7e2b9d34ee91cf33a554a545f9dfdb1df8f187b11cb100d9a3a5c DIST udev-146-gentoo-patchset-v1.tar.bz2 8370 SHA256 d89845257847c34c9e617c5c64c686902833343dd617401d1ac196cd0589c95c SHA512 ff0573dc171a1c2073f866a6e7cd125d6796919e2c026a2aea869ebe4bbff8cd866980118a8b2ef28c4a1326ff2913ee245d75a852b76908d63d6444bb69251c WHIRLPOOL 175bb3440e5ffcef0b4d3fd2b703aaf3788d0b50c6769a27a72b26cfb4f094418ff884c819946e808d3f3b5a85bd3bf5c3be5a38ca3b4823963e7f772d6bf740 @@ -52,27 +15,28 @@ DIST udev-164.tar.bz2 557126 SHA256 81db1a089e4c13fd73fbb5ace7974ab84e2d92d8a39f DIST udev-171-gentoo-patchset-v1.tar.bz2 796 SHA256 9524e64068d67bb55ddad16dd36a27c3ef87323421254a5bfe2431693b1bc983 SHA512 d2eef776c3cc331b5df339e865838b67b70da01e10fa75c5cb0d45cff388adfa6af4dd36677eb05cee9936331445afadcd4158ed7d96f3499ce93d6ee1e3feb6 WHIRLPOOL d1451d2002263db7bd30baa2d126fcb3ffff6a4b310f8ebfea755760b3afbd3a76ab2aa0d16e1a88cff13567a153155720c4c16c1d4624dd2a4405b29dbb3997 DIST udev-171-testsys.tar.bz2 155001 SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc SHA512 f3f537d771e36b87c71004f5576f7672ffeb815d0b5337bb6bbb6e842c32a28d1d92b4eb0ee2edc60c0b8bd576fc2f36e8b0ed16ec9c0cff9c216e04fb1438ad WHIRLPOOL 0ee66df2f52496d592d0dd3de7c628f6deee7f41c2d21e745f22d74e61c276e01cc6ba584c65b05d36c8a4fb14bc54e3e1a89b975751929b19e91458e3550253 DIST udev-171.tar.bz2 597937 SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e SHA512 dea189d79b195f8c10740507b11de2c2074442301ee52a0b2c62efa8663e1793c1a78b03b95510ba19bc93d4dcc497120fbf6bb5784878aa903973f76b92d42f WHIRLPOOL a93241b0f0645696e6a88ddb152c3ef8f2c73b5bf3591892384f180fc7abeb580c59642013480546eac00ad5028b1900ad35b88f6a27ad2d07792e9f34e59743 +DIST udev-gentoo-legacy-patchset-1.tar.bz2 14039 SHA256 0a82fd7a6ed4212dc26d7b562d91e9bb7174581717683d447902f308110b635a SHA512 4a64d972ab361c781ebde7f9360d7842f8be2c945fbcf526019a49194197af9f2575e5ba399d7494c84b12489fe09333bf225f697b786fb6ccef7b287e58c9cc WHIRLPOOL 70e84987aa3c5ef93d624014bd13156a95d456ade17389b2a89261f57dee32d1dd7f416dd2397c4e6e2bbc09d0fee7acde8325bdf203021f45c49adf7c6e72ba DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef SHA512 ead3f34a906bd18a6895029f6d5f5a771fc237d437b621151d40142376ba6fa10e408a881c7dafcd308d5c5a66766ce9db8f612f0f78899362e8b30eda4aa0c5 WHIRLPOOL 4558a8d3073a7aa79d522e459f7c212b2a97f726f67a6f9665a3e9abd3dea6b2c888d52dd716de4b53628002af354fb5de41a83cdd71fdfc853e35978c6d5db6 DIST udev-gentoo-scripts-7.tar.bz2 16248 SHA256 cef8d47fe3b023c40dde621e0c91a9d38b7e7b83de5bae53e71a9027dfc65de7 SHA512 16d37cb5f2289b789b569a799e62ab282f0667b1c47e54a325a310133212592a051242e137a02db928946278417a7745c5b17bb95d84f25ae071d71d5a4afd3b WHIRLPOOL 5b14aaad1a1771d02e3e6a78e6ecbc5122fbc48ac542f5dfc26539d2b1f64136de5633a2b9bd5bfce414fbffec12799a09bf2b29c375e033a4ea986ffc3ef878 -EBUILD udev-141-r1.ebuild 13067 SHA256 9e26e77a99b8b28e346449aff11c22d47b8f6ff077cd8699a1e0ba46be749efa SHA512 14876741d689e573fa9a596ae781eaffc3a53d879b9081227d587b2d73b2ff3d31021278c5b8687ff0ee3a2942fc09c969c441a3e85a5483f352cb633cbb8c47 WHIRLPOOL 8c9493c7308dc9950d1cfd8b436c8c18150be58229bce31a4578c07d10dad31f3e84387fe8b394c7b7f9d4cabaea1f6212d562ccdbd112097aa021df8199f75e -EBUILD udev-146-r1.ebuild 15330 SHA256 a0287bc63dccad342ff4b419bff74a45d9830d7291488ee4fae65c090d448b2e SHA512 c98f19842abb6aeb3162e32f3b2a7615322bd91df43bfc96257d0c027512bb0a0879452de90407bfb90f0ffb20420414702923300fc6eb6308accdb9aa232fcb WHIRLPOOL 43359b3279d7a6e7bac360714efaeefe6a0e9fa9eae86d7f6d3269b0330d33e9a3df48ea5d7994d64f20d2915c96fe8aadca132b8178ef407f88c43b7d4294bc -EBUILD udev-149.ebuild 16487 SHA256 019f85b3c3563829fb702539d404e682a06f68dec6ee18d70d6349ce117927ef SHA512 4088975eaad67e0c7169fa00a782fbe622de89e9bc30a0f68bf8ea105343fdcf145c0e5d038356fa0d909d6cf1756c6b5b31e59f65f186a02ac7118f9b110c1a WHIRLPOOL 558f4f390a10af4ec18ee52e1fa8eb7f4f8d0ef32ce2d4ea7acb0de13058330d574cb640995a6c53b536a97b22cf643fe670382e8545b012c499353bddd6ccdd -EBUILD udev-151-r4.ebuild 16726 SHA256 b13a59a4067a95ced0f0cfe62806f23bd9b7c075a62f1a80592bc49cc468316f SHA512 2a0f779a61e26912485f7918c1e20881a653846ba0acce17b2a393938ff03606ae0cdc7e8a6aaef2554700b7b6a9f993fb0ee7288e2f088675aa9e7c725ae0cf WHIRLPOOL 37f623e936def4d2f2bfc82b7d54c83d57efda0521134ac99eca173515b449c89fa51c31a0b15a20a76e44df191e1f21efa90b0b1b5f1574f9d9d1df2ae79a4c -EBUILD udev-164-r2.ebuild 15093 SHA256 053e8a6a34dc09a04b4699352fca63002ec93e43eca55a450cba5a2aa29bd9d0 SHA512 d038e1f82b8478863ff643999e912b0953953ffdb3acd3a0e6458df99f22ad3e3ede327a1d0d0352508854b9b48ef144ba4edf44c3d377fadb059b28be00e80f WHIRLPOOL f997f9b1a41d4f279a87f160e0c4c2948863f5a347b1044c40b357fa32b416469bd63c22f58ed753e8ab4a4888cd0f32fea1789be106289473bd90ed60c3e21f -EBUILD udev-171-r6.ebuild 15656 SHA256 8e7ec8febaa1f01fa099e224db36542fb7512934f1e5753fabb02acb7315b4b4 SHA512 e6dfbc6ec25503a21727b5f209146a2a9963c6ff5f45d9f47e1127a7d47ddf3607a268b9c86f91429a743faf5e46992d650b06170ac2a82b42a1f3dc3a9cd496 WHIRLPOOL 18e7e380ece2c2fc3a8d9676733378f8c39be078b088fa386cf420f202a5ac157e6cefdd584e480b277ff5ed7fdae9d9848df903f2113aa9c7e979a3570fdcb2 +EBUILD udev-141-r1.ebuild 13134 SHA256 08c56c0ad429011e3096999b3fd1bf9fa4d321a7327fd955f7b20bb94dca6742 SHA512 906d40367bef8adc15639af364170bceec369ca7d96ba81638259cd4a47501126e634ea0d69d105cd2375e41fd648e535f136059a0ba87ce03ce4fdfb6086daa WHIRLPOOL 539df69166ce8a7a1f89c40b43f710092f16e0dc2c13a34e68474bedd2f166279ded5abefb5a42c3c99d03190cc07f8f495c78faaf1a508637efdc28f2efa112 +EBUILD udev-146-r1.ebuild 15397 SHA256 034726b24a1fe9cc16ffd084c8aef92c95aae66638412a12b9d95bce790a89e2 SHA512 a0a7a354782561a84f647d32e6d13642899d541391a681588ec992cc9b06f9aae740cd35ccd7a414487b31c3d614c179de49c6403b18b39f6264a93baec14ae8 WHIRLPOOL 9499f96c148a9790234ed20467f57324910bd33d95a7d38b68022e3175f7f2bc1498be4352c9d805bbb603e2866da625f9a76e35b5607e9cb9c564a8946c6191 +EBUILD udev-149.ebuild 16479 SHA256 7ffa5b9e1d6793684d1f54f6d50d14d3eec3320f7a6747fa26099ee511616603 SHA512 5e3718e21442c22a61a8854f09f866bed0829c8f925ecc8b87c581e935ebfd56c5616150a6c126c18560949e7906b6e0889a65a274217ab47c186d5eb71885e1 WHIRLPOOL 41bd8404608caa04400f6e4b5a71516eaa8fecb3deec7d75dc9a3f108e9095d36fdb34f5c012aa90c62b6b0304def7c5a7623c3c34b8dc663f4205417b09934e +EBUILD udev-151-r4.ebuild 16792 SHA256 b9821f05b54788b589b142c61149ce0e8529e58adb613cdc74ae1eb3a66d3bae SHA512 75dd32b0aba3c0cff242898fb499cb90908f392f728e4ef1103efbef0e616658828c7b5910c4e1c63aeaa844ee0667596c38ec8cc35a753c8690b06bc5a1d6e8 WHIRLPOOL fdfa2322fd5d6b1dd08a2832ef64d4c7de4205dc7281be2375fc0cb4546459c34e33d5d13e9582907dd14409490418aaef71678e76e6991b6893d5fe9aab934f +EBUILD udev-164-r2.ebuild 15166 SHA256 0f9bcf6c0b6bdf72f0363e691653ca25b4b9c2f0d14239153a4b7810e418537f SHA512 aabcc43be3e872330b06c34b3ecd3ffd0dc07144b774da373e3a068cfdfc5c13327a33e822db3fac198e61a6edcd4681539e1966d74715c72a87360ec3cc6941 WHIRLPOOL 100a43cd6acb4ca212c4a8e28a1ebb0bd92d07986439032da6018a48acd8aac8bd88f5b198246a6c26776563dcb1a06a1f1f031e61b9289c232d3e4ebfec5ad9 +EBUILD udev-171-r6.ebuild 15730 SHA256 2eab4e525737c75f0c13828ff2b62c5cc4c826580151cbc5d2bca400821e43f5 SHA512 03f085f83ef0a9ce536e3a08539da81c3dfc51ba80de4e9b736e40bfa481fd635cd1176a8b1e1b01aaf8e2ddf53803dac5d6ab163f39a1828bd52fd85936312a WHIRLPOOL 2026eed2cb233176a188ad83d1639c1e80ac34ba5579564b1e97955d33828ffee80b95b302b3d41f755481162a6f44f7874e4d32d2cf13637bbccdafcad4115a EBUILD udev-186.ebuild 9793 SHA256 87c3229e5206a49788ff16954bc319cfc4b7616a78c9ef3f440a011ced1d95e6 SHA512 2f1f0f82403052507e305077479942bb577cd5d195d01090563a4007e7a790f7ed5ff9063dcb4664a1d7bb04967840785f08dc73c481dc6a9c911e83959c7ca4 WHIRLPOOL 671312a575fc27fc8dd5ac0b62f832d4f1da3990283e9705b97e5b1eb3cce025b79ca8c81c54e86c1225af89537a625426321caff1bfb1803a936c018d3c41f3 EBUILD udev-9999.ebuild 8897 SHA256 20ea04b26e8ef06aacc81143010fe1e6e9c7310ed874d2298c61e40ed679be91 SHA512 f4d9244271580ba509d50dc8fc2d6be32bb5faad5455b8739c93f8ed939fa61b016bc7bcdfd33b19f22e694bc15096f256b75b6aa606a36947d9d638649cdc9a WHIRLPOOL 3f347a98876c3d0e4ea8c5e8ca3ad65f78d2b9c8b32aaed5a45daccfd7666caa83b3478454488f9ff14b9c43cd37b8253566de3e8226bc2804defddc44d41d15 -MISC ChangeLog 35985 SHA256 da075c81e06080d9cac471f37649a03a7f3c3b8c48a83fe2287b4475fbb67069 SHA512 c0e87f35d28bbe98a8ae970e930e870516b3bdb9139dd79cce9402a021770fcb4077e00253c851960ef11fc56ea0344740a35b28a0a1785429de1a379103daf5 WHIRLPOOL 131729c48cab988de50d9091d421421d5b438218875dc957366ca97892b8ad241a8e7d6e8961213ee8915d861f00d2b39a448e7bcd2ae01f643b5f20377e83e0 +MISC ChangeLog 37380 SHA256 b86ff98068bbe3a81d7029ef08f2cbb26051ceed6b3d45135c5d453279ebb062 SHA512 e1d2d756cd3d6280b852ebbaf3a8ce4fb440995474279118c50515cd971cfd57344185a3142cced80aad87760859be810b4661ddaf78a47ab1b37f01beff5d16 WHIRLPOOL 69cfb8dd7aa2a3436f35b7d15711179c26a49ffd2cc068fcdab6ada09441e201163bea753af3a04b951e53b8d1ca7eddbaf3fdcc33824eb8676e9528a73463fa MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5 MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJQFw1hAAoJEEdUh39IaPFN3xAH/iKzGrmU5KOcwE8XQlhYPbkQ -HWis3UtTuDelTBrPSHEustm2EjCllt7tuP3VmR142/E4UJkWvPNw6FTP9lMNl461 -1THmcsEAhYb3W8I/NeU6rfoaLqubEaiCe73D46baGZ+KIfSApX+qrXXsaNsaXlyh -GtuutPmskaSpuaV20jMNezuSiWhVfL+v4POEdfo8e/2+vpEugW0na6Kjd55CDI7J -V4aWO1gfz//fW8TitB6yD/Uni3aOHjsWMo8ilSSSKnzYwty87wQeoFXKDrKGT6La -cyZCW82Dc6FvVEVkVjzY96y1Ku2hBL5m6OcSJEDU1J+A9YxIYDK35bh4QP/Y8hA= -=2UAm +iQEcBAEBAgAGBQJQF2JUAAoJEEdUh39IaPFNc0gH/Ajts3tu+t0oXcefDnvhULxH +K3N8iGxi0uKNGVqf0ZleSkXk4taTFRa1LbPgBagdzEYY3i3DAv7KmYW3G+jZgSZe ++zsm1Li65YSDaq2kCuHGKTI684OybtosrCu+upTSOb40uXHSu0EcQYer/nppjgLv +1fPKu/o8JoOx/1eF2uzxxVzNTbwdU3Cu+jXUqXfEx4fFz2TWSr1tQfYMfJeJ5S5Z +zkizAtFbi6G1Y85VT4P1Rm4HS+y8sz8LkAWVjCP2KvF7kHGU9q+lv+Hq/P4DCsmC +6ZB5HUGC9z1oGtAdcg95hxTLoaokeGGfQLyM6z5mgpztnFZFhLVoXTqpSj2LlAw= +=nJ7A -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/136/shell-compat-KV.sh b/sys-fs/udev/files/136/shell-compat-KV.sh deleted file mode 100644 index be74fe49e3d6..000000000000 --- a/sys-fs/udev/files/136/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/136/shell-compat-addon.sh b/sys-fs/udev/files/136/shell-compat-addon.sh deleted file mode 100644 index 7e684f4d58e2..000000000000 --- a/sys-fs/udev/files/136/shell-compat-addon.sh +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--quiet" ] && shift - local dir="$1" - - # only check RC_USE_FSTAB on baselayout-1 - yesno "${RC_USE_FSTAB}" || return 1 - - # check if entry is in /etc/fstab - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /etc/fstab) - - "${ret}" - } -fi - - diff --git a/sys-fs/udev/files/136/udev-dev-tarball.initd b/sys-fs/udev/files/136/udev-dev-tarball.initd deleted file mode 100755 index 2cdce4ff226b..000000000000 --- a/sys-fs/udev/files/136/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/136/udev-mount.initd b/sys-fs/udev/files/136/udev-mount.initd deleted file mode 100755 index 694b194cab3d..000000000000 --- a/sys-fs/udev/files/136/udev-mount.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if fstabinfo --quiet /dev; then - mount -n /dev - else - # Some devices require exec, Bug #92921 - mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # copy over any persistant things - if [ -d /lib/udev/devices ]; then - cp -RPp /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - restorecon /dev > /selinux/null - fi - - # make sure it exists - mkdir -p /dev/.udev - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/136/udev-postmount.initd b/sys-fs/udev/files/136/udev-postmount.initd deleted file mode 100755 index 96beb845bb9b..000000000000 --- a/sys-fs/udev/files/136/udev-postmount.initd +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/136/udev-postmount.initd,v 1.3 2009/02/23 16:30:53 zzam Exp $ - -depend() { - need localmount -} - -dir_writeable() -{ - mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$ -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/136/udev-start.sh b/sys-fs/udev/files/136/udev-start.sh deleted file mode 100644 index 8bf098dee1b3..000000000000 --- a/sys-fs/udev/files/136/udev-start.sh +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# inject into boot runlevel -IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/136/udev-stop.sh b/sys-fs/udev/files/136/udev-stop.sh deleted file mode 100644 index 47e095607f0a..000000000000 --- a/sys-fs/udev/files/136/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/136/udev.confd b/sys-fs/udev/files/136/udev.confd deleted file mode 100644 index bffea3569f9b..000000000000 --- a/sys-fs/udev/files/136/udev.confd +++ /dev/null @@ -1,56 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/136/udev.initd b/sys-fs/udev/files/136/udev.initd deleted file mode 100644 index 563ba9815217..000000000000 --- a/sys-fs/udev/files/136/udev.initd +++ /dev/null @@ -1,246 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local d=/dev/.udev/rules.d bname="$1" onoff="$2" - - if yesno "${onoff}"; then - mkdir -p "$d" - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${d}/${bname}" - else - rm -f "${d}/${bname}" - fi -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - ebegin "Starting udevd" - start-stop-daemon --start --exec /sbin/udevd -- --daemon - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - if yesno "${rc_coldplug}"; then - udevadm trigger - else - # Do not run any init-scripts, Bug #206518 - udevadm control --env do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --subsystem-match=net - fi - eend $? - - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --env do_not_run_plug_service= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - # do not display this - better: do only inject it later :) - [ "$svc" = "udev-postmount" ] && continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -inject_postmount_initd() { - if ! mark_service_hotplugged udev-postmount; then - IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 - fi - #einfo "Injected udev-postmount service" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start - - display_hotplugged_services - - inject_postmount_initd - - return 0 -} - -_start() -{ - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/147/shell-compat-KV.sh b/sys-fs/udev/files/147/shell-compat-KV.sh deleted file mode 100644 index be74fe49e3d6..000000000000 --- a/sys-fs/udev/files/147/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/147/shell-compat-addon.sh b/sys-fs/udev/files/147/shell-compat-addon.sh deleted file mode 100644 index c271abfd548f..000000000000 --- a/sys-fs/udev/files/147/shell-compat-addon.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# mountinfo <path> -# check if some filesystem is mounted at mountpoint <path> -# -# return value: -# 0 filesystem is mounted at <path> -# 1 no filesystem is mounted exactly at <path> -if ! cmd_exist mountinfo; then - mountinfo() { - [ "$1" = "-q" ] && shift - local dir="$1" - - # check if entry is in /proc/mounts - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /proc/mounts) - - "${ret}" - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# used syntax: fstabinfo --mount /dev -# it should mount /dev if an entry exists in /etc/fstab -# -# return value: -# 0 mount succeeded -# 1 mount failed or no entry exists -# -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--mount" ] || return 1 - local dir="$2" - - # RC_USE_FSTAB does only exist in baselayout-1 - # this emulation is only needed on bl-1, so check always - yesno "${RC_USE_FSTAB}" || return 1 - - # no need to check fstab, mount does this already for us - - # try mounting - better first check fstab and then mount without surpressing errors - mount -n "${dir}" 2>/dev/null - return $? - } -fi diff --git a/sys-fs/udev/files/147/udev-dev-tarball.initd b/sys-fs/udev/files/147/udev-dev-tarball.initd deleted file mode 100755 index 2cdce4ff226b..000000000000 --- a/sys-fs/udev/files/147/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/147/udev-mount.initd b/sys-fs/udev/files/147/udev-mount.initd deleted file mode 100755 index 179c9f80ac59..000000000000 --- a/sys-fs/udev/files/147/udev-mount.initd +++ /dev/null @@ -1,114 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - if mountinfo -q /dev; then - einfo "/dev is already mounted" - return 0 - fi - - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if ! fstabinfo --mount /dev; then - # we mount devtmpfs if supported - local fs=tmpfs - grep -qs devtmpfs /proc/filesystems && fs=devtmpfs - - # Some devices require exec, Bug #92921 - mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # copy over any persistant things - if [ -d /lib/udev/devices ]; then - cp -RPp /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - restorecon /dev > /selinux/null - fi - - # make sure it exists - mkdir -p /dev/.udev /dev/.udev/rules.d - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/147/udev-postmount.initd b/sys-fs/udev/files/147/udev-postmount.initd deleted file mode 100755 index 439d1a596a6e..000000000000 --- a/sys-fs/udev/files/147/udev-postmount.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/147/udev-postmount.initd,v 1.2 2009/10/20 12:38:14 zzam Exp $ - -depend() { - need localmount - after dbus # for trigger failed -} - -dir_writeable() -{ - mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$ -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - # Run the events that failed at first udev trigger - udevadm trigger --type=failed -v - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/147/udev-start.sh b/sys-fs/udev/files/147/udev-start.sh deleted file mode 100644 index e927e8c14427..000000000000 --- a/sys-fs/udev/files/147/udev-start.sh +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# set it as openrc does -RC_BOOTLEVEL=${BOOTLEVEL:-default} -RC_DEFAULTLEVEL=${DEFAULTLEVEL:-default} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/147/udev-stop.sh b/sys-fs/udev/files/147/udev-stop.sh deleted file mode 100644 index 47e095607f0a..000000000000 --- a/sys-fs/udev/files/147/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/147/udev.confd b/sys-fs/udev/files/147/udev.confd deleted file mode 100644 index bffea3569f9b..000000000000 --- a/sys-fs/udev/files/147/udev.confd +++ /dev/null @@ -1,56 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/147/udev.initd b/sys-fs/udev/files/147/udev.initd deleted file mode 100644 index 36a7c054cea2..000000000000 --- a/sys-fs/udev/files/147/udev.initd +++ /dev/null @@ -1,263 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2" - - if yesno "${onoff}"; then - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${f}" - else - rm -f "${f}" - fi -} - -# only called on openrc -is_service_enabled() { - local svc="$1" - - [ ! -e "/etc/init.d/${svc}" ] && return 1 - - [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0 - [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0 - return 1 -} - -check_openrc_net() -{ - local f=/dev/.udev/rules.d/90-network.rules - is_service_enabled network || return 0 - - # disable network hotplugging - echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}" - echo "# as we use new-style network init script /etc/init.d/network" >> "${f}" -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - ebegin "Starting udevd" - start-stop-daemon --start --exec /sbin/udevd -- --daemon - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - if yesno "${rc_coldplug}"; then - udevadm trigger - else - # Do not run any init-scripts, Bug #206518 - udevadm control --env do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --subsystem-match=net - fi - eend $? - - # we can speed up booting under these conditions: - # * using devtmpfs so kernel creates device nodes for us - # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere) - # - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --env do_not_run_plug_service= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - check_openrc_net - _start - - display_hotplugged_services - - return 0 -} - -_start() -{ - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then - ewarn "You should add udev-postmount service to your default runlevel." - fi - - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/151-r4/shell-compat-KV.sh b/sys-fs/udev/files/151-r4/shell-compat-KV.sh deleted file mode 100644 index be74fe49e3d6..000000000000 --- a/sys-fs/udev/files/151-r4/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/151-r4/shell-compat-addon.sh b/sys-fs/udev/files/151-r4/shell-compat-addon.sh deleted file mode 100644 index c271abfd548f..000000000000 --- a/sys-fs/udev/files/151-r4/shell-compat-addon.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# mountinfo <path> -# check if some filesystem is mounted at mountpoint <path> -# -# return value: -# 0 filesystem is mounted at <path> -# 1 no filesystem is mounted exactly at <path> -if ! cmd_exist mountinfo; then - mountinfo() { - [ "$1" = "-q" ] && shift - local dir="$1" - - # check if entry is in /proc/mounts - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /proc/mounts) - - "${ret}" - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# used syntax: fstabinfo --mount /dev -# it should mount /dev if an entry exists in /etc/fstab -# -# return value: -# 0 mount succeeded -# 1 mount failed or no entry exists -# -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--mount" ] || return 1 - local dir="$2" - - # RC_USE_FSTAB does only exist in baselayout-1 - # this emulation is only needed on bl-1, so check always - yesno "${RC_USE_FSTAB}" || return 1 - - # no need to check fstab, mount does this already for us - - # try mounting - better first check fstab and then mount without surpressing errors - mount -n "${dir}" 2>/dev/null - return $? - } -fi diff --git a/sys-fs/udev/files/151-r4/udev-dev-tarball.initd b/sys-fs/udev/files/151-r4/udev-dev-tarball.initd deleted file mode 100755 index 2cdce4ff226b..000000000000 --- a/sys-fs/udev/files/151-r4/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/151-r4/udev-mount.initd b/sys-fs/udev/files/151-r4/udev-mount.initd deleted file mode 100755 index 4acdf0981841..000000000000 --- a/sys-fs/udev/files/151-r4/udev-mount.initd +++ /dev/null @@ -1,119 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - if mountinfo -q /dev; then - einfo "/dev is already mounted" - return 0 - fi - - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if ! fstabinfo --mount /dev; then - # we mount devtmpfs if supported - local fs=tmpfs - grep -qs devtmpfs /proc/filesystems && fs=devtmpfs - - # Some devices require exec, Bug #92921 - mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - ${HAVE_SELINUX} && restorecon /dev/null - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # copy over any persistant things - if [ -d /lib/udev/devices ]; then - cp -RPp /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - ${HAVE_SELINUX} && restorecon -R /dev >/dev/null - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - HAVE_SELINUX=true - restorecon /dev > /selinux/null - else - HAVE_SELINUX=false - fi - - # make sure it exists - mkdir -p /dev/.udev /dev/.udev/rules.d - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/151-r4/udev-postmount.initd b/sys-fs/udev/files/151-r4/udev-postmount.initd deleted file mode 100755 index 643d5dfd4b58..000000000000 --- a/sys-fs/udev/files/151-r4/udev-postmount.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/151-r4/udev-postmount.initd,v 1.1 2010/05/05 19:35:07 zzam Exp $ - -depend() { - need localmount - after dbus # for trigger failed -} - -dir_writeable() -{ - mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$ -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - # Run the events that failed at first udev trigger - udevadm trigger --type=failed -v - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/151-r4/udev-start.sh b/sys-fs/udev/files/151-r4/udev-start.sh deleted file mode 100644 index e927e8c14427..000000000000 --- a/sys-fs/udev/files/151-r4/udev-start.sh +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# set it as openrc does -RC_BOOTLEVEL=${BOOTLEVEL:-default} -RC_DEFAULTLEVEL=${DEFAULTLEVEL:-default} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/151-r4/udev-stop.sh b/sys-fs/udev/files/151-r4/udev-stop.sh deleted file mode 100644 index 47e095607f0a..000000000000 --- a/sys-fs/udev/files/151-r4/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/151-r4/udev.confd b/sys-fs/udev/files/151-r4/udev.confd deleted file mode 100644 index af75ab32e5e0..000000000000 --- a/sys-fs/udev/files/151-r4/udev.confd +++ /dev/null @@ -1,63 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Run udevd so that all events are serialized, read more in man udevd at --debug-trace -#udev_trace="YES" - -# Run udevd --debug and write output to /dev/.udev/udev.log -# Should not be kept on as it fills diskspace slowly -#udev_debug="YES" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/151-r4/udev.initd b/sys-fs/udev/files/151-r4/udev.initd deleted file mode 100644 index 92dcdf96e3c0..000000000000 --- a/sys-fs/udev/files/151-r4/udev.initd +++ /dev/null @@ -1,273 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver nolxc noopenvz - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2" - - if yesno "${onoff}"; then - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${f}" - else - rm -f "${f}" - fi -} - -# only called on openrc -is_service_enabled() { - local svc="$1" - - [ ! -e "/etc/init.d/${svc}" ] && return 1 - - [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0 - [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0 - return 1 -} - -check_openrc_net() -{ - local f=/dev/.udev/rules.d/90-network.rules - is_service_enabled network || return 0 - - # disable network hotplugging - echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}" - echo "# as we use new-style network init script /etc/init.d/network" >> "${f}" -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - local opts="" - yesno "${udev_trace:-no}" && opts="${opts} --debug-trace" - - ebegin "Starting udevd" - if yesno "${udev_debug:-no}"; then - /sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log - else - start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts} - fi - - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - udevadm control --property=STARTUP=1 - if yesno "${rc_coldplug}"; then - udevadm trigger --action="add" - else - # Do not run any init-scripts, Bug #206518 - udevadm control --property=do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --action="add" --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --action="add" --subsystem-match=net - fi - eend $? - - # we can speed up booting under these conditions: - # * using devtmpfs so kernel creates device nodes for us - # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere) - # - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --property=do_not_run_plug_service= - udevadm control --property=STARTUP= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - check_openrc_net - _start - - display_hotplugged_services - - return 0 -} - -_start() -{ - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then - ewarn "You should add udev-postmount service to your default runlevel." - fi - - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/blacklist-146 b/sys-fs/udev/files/blacklist-146 deleted file mode 100644 index 90bc234b2bec..000000000000 --- a/sys-fs/udev/files/blacklist-146 +++ /dev/null @@ -1,29 +0,0 @@ -# This file lists modules which will not be loaded by udev, -# not at coldplugging and not on hotplug events. - -# Add your own entries to this file -# in the format "blacklist <name of module>" - -# Some examples: -# evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# Autoloading eth1394 most of the time re-orders your network -# interfaces, and with buggy kernel 2.6.21, udev persistent-net -# is not able to rename these devices, so you get eth?_rename devices -# plus an exceeded 30sec boot timeout -blacklist eth1394 - -# You probably want this to not get the console beep loud on every tab :) -#blacklist pcspkr - -# these drivers are very simple, the HID drivers are usually preferred -#blacklist usbmouse -#blacklist usbkbd - -# Sometimes loading a framebuffer driver at boot gets the console black -#install pci:v*d*sv*sd*bc03sc*i* /bin/true - -# hplip and cups 1.4+ use raw USB devices, so it requires usblp not be loaded -#blacklist usblp - diff --git a/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh b/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh deleted file mode 100755 index 1a0259798bc1..000000000000 --- a/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -. /etc/init.d/functions.sh - -# store persistent-rules that got created while booting -# when / was still read-only -store_persistent_rules() { - local file dest - - for file in /dev/.udev/tmp-rules--*; do - dest=${file##*tmp-rules--} - [ "$dest" = '*' ] && break - type=${dest##70-persistent-} - type=${type%%.rules} - ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" - cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" - eend $? "Failed moving persistent rules!" - done -} - -store_persistent_rules - -# vim:ts=4 diff --git a/sys-fs/udev/files/net-130-r1.sh b/sys-fs/udev/files/net-130-r1.sh deleted file mode 100755 index af61870d8239..000000000000 --- a/sys-fs/udev/files/net-130-r1.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# net.sh: udev external RUN script -# -# Copyright 2007 Roy Marples <uberlord@gentoo.org> -# Distributed under the terms of the GNU General Public License v2 - -IFACE=$1 -ACTION=$2 - -SCRIPT=/etc/init.d/net.$IFACE - -# ignore interfaces that are registered after being "up" (?) -case ${IFACE} in - ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*|br*) - exit 0 ;; -esac - -# stop here if coldplug is disabled, Bug #206518 -if [ "${do_not_run_plug_service}" = 1 ]; then - exit 0 -fi - -if [ ! -x "${SCRIPT}" ] ; then - #do not flood log with messages, bug #205687 - #logger -t udev-net.sh "${SCRIPT}: does not exist or is not executable" - exit 1 -fi - -# If we're stopping then sleep for a bit in-case a daemon is monitoring -# the interface. This to try and ensure we stop after they do. -[ "${ACTION}" == "stop" ] && sleep 2 - -IN_HOTPLUG=1 "${SCRIPT}" --quiet "${ACTION}" diff --git a/sys-fs/udev/files/pnp-aliases b/sys-fs/udev/files/pnp-aliases deleted file mode 100644 index 3675fbbc6999..000000000000 --- a/sys-fs/udev/files/pnp-aliases +++ /dev/null @@ -1,17 +0,0 @@ -# /etc/modprobe.d/pnp-aliases -# -# These aliases are used by this udev-rule: -# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'" -# -# They should help to autoload drivers used by various pnp-devices -# (if not blacklisted somewhere else) -# -alias pnp:dPNP0510 irtty-sir -alias pnp:dPNP0511 irtty-sir -alias pnp:dPNP0700 floppy -alias pnp:dPNP0800 pcspkr -alias pnp:dPNP0b00 rtc -alias pnp:dPNP0303 atkbd -alias pnp:dPNP0f13 psmouse -alias pnp:dPNPb02f analog - diff --git a/sys-fs/udev/files/shell-compat-KV.sh b/sys-fs/udev/files/shell-compat-KV.sh deleted file mode 100644 index d363ec65a2c2..000000000000 --- a/sys-fs/udev/files/shell-compat-KV.sh +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%[!0-9.]*} y= z= - local KV_MAJOR=${x%%.*} - y=${x#*.} - [ "$x" = "$y" ] && y=0.0 - local KV_MINOR=${y%%.*} - z=${y#*.} - [ "$y" = "$z" ] && z=0 - local KV_MICRO=${z%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/udev-141-remove-devfs-names.diff b/sys-fs/udev/files/udev-141-remove-devfs-names.diff deleted file mode 100644 index 56501f828a0e..000000000000 --- a/sys-fs/udev/files/udev-141-remove-devfs-names.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/rules/gentoo/40-gentoo.rules b/rules/gentoo/40-gentoo.rules -index 4751b51..91a7545 100644 ---- a/rules/gentoo/40-gentoo.rules -+++ b/rules/gentoo/40-gentoo.rules -@@ -1,11 +1,5 @@ - # do not edit this file, it will be overwritten on update - --# old devfs path, removing this could break systems --# Bug 195839 --KERNEL=="md[0-9]*", SYMLINK+="md/%n" --KERNEL=="loop[0-9]*", SYMLINK+="loop/%n" --KERNEL=="ram[0-9]*", SYMLINK+="rd/%n" -- - # keep devices after driver unload - KERNEL=="ppp", OPTIONS+="ignore_remove" - KERNEL=="tun", OPTIONS+="ignore_remove" diff --git a/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff b/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff deleted file mode 100644 index 7690f6b39af9..000000000000 --- a/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c -index 8f70be4..16455de 100644 ---- a/extras/firmware/firmware.c -+++ b/extras/firmware/firmware.c -@@ -149,6 +149,7 @@ int main(int argc, char **argv) - - util_path_encode(firmware, fwencpath, sizeof(fwencpath)); - util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL); -+ util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); - - if (fwfile == NULL) { - int err; -@@ -166,6 +167,7 @@ int main(int argc, char **argv) - udev_selinux_resetfscreatecon(udev); - } while (err == -ENOENT); - rc = 2; -+ set_loading(udev, loadpath, "-1"); - goto exit; - } - -@@ -176,7 +178,6 @@ int main(int argc, char **argv) - if (unlink(misspath) == 0) - util_delete_path(udev, misspath); - -- util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); - set_loading(udev, loadpath, "1"); - - util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL); - diff --git a/sys-fs/udev/files/udev-151-readd-hd-rules.diff b/sys-fs/udev/files/udev-151-readd-hd-rules.diff deleted file mode 100644 index 53e99b0569e6..000000000000 --- a/sys-fs/udev/files/udev-151-readd-hd-rules.diff +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules -index 132a680..a3e8e3c 100644 ---- a/extras/cdrom_id/60-cdrom_id.rules -+++ b/extras/cdrom_id/60-cdrom_id.rules -@@ -2,4 +2,4 @@ - - # import optical drive properties - ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \ -- KERNEL=="sr[0-9]*|xvd*", IMPORT{program}="cdrom_id --export $tempnode" -+ KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]|xvd*", IMPORT{program}="cdrom_id --export $tempnode" -diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules -index f8556d1..ba07079 100644 ---- a/rules/rules.d/50-udev-default.rules -+++ b/rules/rules.d/50-udev-default.rules -@@ -77,9 +77,12 @@ SUBSYSTEM=="block", GROUP="disk" - - # floppy - SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" -+SUBSYSTEM=="block", KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k" -+KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions" - - # cdrom - SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom" -+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom" - SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" - KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" - KERNEL=="pktcdvd", GROUP="cdrom" -diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules -index 89041a9..6f12a9a 100644 ---- a/rules/rules.d/60-persistent-storage.rules -+++ b/rules/rules.d/60-persistent-storage.rules -@@ -12,12 +12,21 @@ SUBSYSTEM!="block", GOTO="persistent_storage_end" - # skip rules for inappropriate block devices - KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end" - -+# never access non-cdrom removable ide devices, the drivers are causing event loops on open() -+KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end" -+KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end" -+ - # ignore partitions that span the entire disk - TEST=="whole_disk", GOTO="persistent_storage_end" - - # for partitions import parent information - ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" - -+# by-id (hardware serial number) -+KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -+KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}" -+KERNEL=="hd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}-part%n" -+ - # USB devices use their own serial number - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" - # ATA devices with their own "ata" kernel subsystem diff --git a/sys-fs/udev/files/udev-164-remove-v4l1.patch b/sys-fs/udev/files/udev-164-remove-v4l1.patch deleted file mode 100644 index 288da53cb369..000000000000 --- a/sys-fs/udev/files/udev-164-remove-v4l1.patch +++ /dev/null @@ -1,47 +0,0 @@ -Author: Kay Sievers <kay.sievers@vrfy.org> -Date: Tue Feb 15 17:24:32 2011 +0100 - - v4l_id: kill the v4l1 ioctl - - Recent kernels do not have v4l1 anymore. - -diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c -index d530a6d..21cb328 100644 ---- a/extras/v4l_id/v4l_id.c -+++ b/extras/v4l_id/v4l_id.c -@@ -28,7 +28,6 @@ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/ioctl.h> --#include <linux/videodev.h> - #include <linux/videodev2.h> - - int main (int argc, char *argv[]) -@@ -39,7 +38,6 @@ int main (int argc, char *argv[]) - }; - int fd; - char *device; -- struct video_capability v1cap; - struct v4l2_capability v2cap; - - while (1) { -@@ -82,19 +80,6 @@ int main (int argc, char *argv[]) - if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) - printf("radio:"); - printf("\n"); -- } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { -- printf("ID_V4L_VERSION=1\n"); -- printf("ID_V4L_PRODUCT=%s\n", v1cap.name); -- printf("ID_V4L_CAPABILITIES=:"); -- if ((v1cap.type & VID_TYPE_CAPTURE) > 0) -- printf("capture:"); -- if ((v1cap.type & VID_TYPE_OVERLAY) > 0) -- printf("video_overlay:"); -- if (v1cap.audios > 0) -- printf("audio:"); -- if ((v1cap.type & VID_TYPE_TUNER) > 0) -- printf("tuner:"); -- printf("\n"); - } - - close (fd); diff --git a/sys-fs/udev/files/write_root_link_rule-125 b/sys-fs/udev/files/write_root_link_rule-125 deleted file mode 100755 index 8eaea117693a..000000000000 --- a/sys-fs/udev/files/write_root_link_rule-125 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# This script should run before doing udevtrigger at boot. -# It will create a rule matching the device directory / is on, and -# creating /dev/root symlink pointing on its device node. -# -# This is especially useful for hal looking at /proc/mounts containing -# a line listing /dev/root as device: -# /dev/root / reiserfs rw 0 0 -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation version 2 of the License. -# -# (c) 2007-2008 Matthias Schwarzott <zzam@gentoo.org> - -eval $(udevadm info --export --export-prefix="ROOT_" --device-id-of-file=/) - -[ $? = 0 ] || exit 0 -[ "$ROOT_MAJOR" = 0 ] && exit 0 - -DIR=/dev/.udev/rules.d -[ -d "$DIR" ] || mkdir -p "$DIR" -RULES=$DIR/10-root-link.rules - -echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}" -echo "# This rule should create /dev/root as link to real root device." >> "${RULES}" -echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", SYMLINK+=\"root\"" >> "${RULES}" - diff --git a/sys-fs/udev/udev-141-r1.ebuild b/sys-fs/udev/udev-141-r1.ebuild index 335102d14b31..3e3bd084584f 100644 --- a/sys-fs/udev/udev-141-r1.ebuild +++ b/sys-fs/udev/udev-141-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141-r1.ebuild,v 1.8 2012/07/30 22:41:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141-r1.ebuild,v 1.9 2012/07/31 04:43:38 ssuominen Exp $ # # Please do not remove this version: @@ -16,7 +16,8 @@ if [[ ${PV} == "9999" ]]; then EGIT_BRANCH="master" inherit git-2 autotools else - SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" + SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 + http://dev.gentoo.org/~ssuominen/${PN}-gentoo-legacy-patchset-1.tar.bz2" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -96,7 +97,7 @@ src_unpack() { # patches go here... if ! use devfs-compat; then # see Bug #269359 - epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff + epatch "${WORKDIR}"/udev-141-remove-devfs-names.diff fi # change rules back to group uucp instead of dialout for now @@ -145,7 +146,7 @@ src_compile() { } src_install() { - local scriptdir="${FILESDIR}/136" + local scriptdir="${WORKDIR}/136" into / emake DESTDIR="${D}" install || die "make install failed" @@ -158,10 +159,10 @@ src_install() { fi exeinto "${udev_helper_dir}" - newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" - newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + newexe "${WORKDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" + newexe "${WORKDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ || die "move_tmp_persistent_rules.sh not installed properly" - newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \ + newexe "${WORKDIR}"/write_root_link_rule-125 write_root_link_rule \ || die "write_root_link_rule not installed properly" doexe "${scriptdir}"/shell-compat-KV.sh \ @@ -224,8 +225,8 @@ src_install() { || die "config file not installed properly" insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf - newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + newins "${WORKDIR}"/blacklist-146 blacklist.conf + newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf # convert /lib/udev to real used dir sed_helper_dir \ diff --git a/sys-fs/udev/udev-146-r1.ebuild b/sys-fs/udev/udev-146-r1.ebuild index f9a4470b9989..30ae52dbab19 100644 --- a/sys-fs/udev/udev-146-r1.ebuild +++ b/sys-fs/udev/udev-146-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.20 2012/05/16 03:21:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.21 2012/07/31 04:43:38 ssuominen Exp $ EAPI="1" @@ -14,7 +14,8 @@ if [[ ${PV} == "9999" ]]; then inherit git-2 autotools else SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 - mirror://gentoo/${PATCHSET}.tar.bz2" + mirror://gentoo/${PATCHSET}.tar.bz2 + http://dev.gentoo.org/~ssuominen/${PN}-gentoo-legacy-patchset-1.tar.bz2" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -144,11 +145,11 @@ src_unpack() { if ! use devfs-compat; then # see Bug #269359 - epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff + epatch "${WORKDIR}"/udev-141-remove-devfs-names.diff fi # Bug 413055 - epatch "${FILESDIR}"/udev-164-remove-v4l1.patch + epatch "${WORKDIR}"/udev-164-remove-v4l1.patch # change rules back to group uucp instead of dialout for now sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ @@ -199,7 +200,7 @@ src_compile() { } src_install() { - local scriptdir="${FILESDIR}/136" + local scriptdir="${WORKDIR}/136" into / emake DESTDIR="${D}" install || die "make install failed" @@ -219,10 +220,10 @@ src_install() { fi exeinto "${udev_libexec_dir}" - newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" - newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + newexe "${WORKDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" + newexe "${WORKDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ || die "move_tmp_persistent_rules.sh not installed properly" - newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \ + newexe "${WORKDIR}"/write_root_link_rule-125 write_root_link_rule \ || die "write_root_link_rule not installed properly" doexe "${scriptdir}"/shell-compat-KV.sh \ @@ -284,8 +285,8 @@ src_install() { || die "config file not installed properly" insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf - newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + newins "${WORKDIR}"/blacklist-146 blacklist.conf + newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf # convert /lib/udev to real used dir sed_libexec_dir \ diff --git a/sys-fs/udev/udev-149.ebuild b/sys-fs/udev/udev-149.ebuild index ac4e17cffd0c..c759565b7da2 100644 --- a/sys-fs/udev/udev-149.ebuild +++ b/sys-fs/udev/udev-149.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.25 2012/05/16 03:21:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.26 2012/07/31 04:43:38 ssuominen Exp $ EAPI="1" @@ -154,11 +154,11 @@ src_unpack() { if ! use devfs-compat; then # see Bug #269359 - epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff + epatch "${WORKDIR}"/udev-141-remove-devfs-names.diff fi # Bug 413055 - epatch "${FILESDIR}"/udev-164-remove-v4l1.patch + epatch "${WORKDIR}"/udev-164-remove-v4l1.patch # change rules back to group uucp instead of dialout for now sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ @@ -211,7 +211,7 @@ src_compile() { } src_install() { - local scriptdir="${FILESDIR}/147" + local scriptdir="${WORKDIR}/147" into / emake DESTDIR="${D}" install || die "make install failed" @@ -231,10 +231,10 @@ src_install() { fi exeinto "${udev_libexec_dir}" - newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" - newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + newexe "${WORKDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" + newexe "${WORKDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ || die "move_tmp_persistent_rules.sh not installed properly" - newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \ + newexe "${WORKDIR}"/write_root_link_rule-125 write_root_link_rule \ || die "write_root_link_rule not installed properly" doexe "${scriptdir}"/shell-compat-KV.sh \ @@ -295,8 +295,8 @@ src_install() { || die "config file not installed properly" insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf - newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + newins "${WORKDIR}"/blacklist-146 blacklist.conf + newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf # convert /lib/udev to real used dir sed_libexec_dir \ diff --git a/sys-fs/udev/udev-151-r4.ebuild b/sys-fs/udev/udev-151-r4.ebuild index 434b779e7673..083610e49a63 100644 --- a/sys-fs/udev/udev-151-r4.ebuild +++ b/sys-fs/udev/udev-151-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r4.ebuild,v 1.23 2012/05/16 03:21:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r4.ebuild,v 1.24 2012/07/31 04:43:38 ssuominen Exp $ EAPI="1" @@ -15,7 +15,8 @@ if [[ ${PV} == "9999" ]]; then else # please update testsys-tarball whenever udev-xxx/test/sys/ is changed SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 - test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 )" + test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 ) + http://dev.gentoo.org/~ssuominen/${PN}-gentoo-legacy-patchset-1.tar.bz2" [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" @@ -155,14 +156,14 @@ src_unpack() { fi # Bug 301667 - epatch "${FILESDIR}"/udev-150-fix-missing-firmware-timeout.diff + epatch "${WORKDIR}"/udev-150-fix-missing-firmware-timeout.diff # Bug 413055 - epatch "${FILESDIR}"/udev-164-remove-v4l1.patch + epatch "${WORKDIR}"/udev-164-remove-v4l1.patch if ! use devfs-compat; then # see Bug #269359 - epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff + epatch "${WORKDIR}"/udev-141-remove-devfs-names.diff fi # change rules back to group uucp instead of dialout for now @@ -185,7 +186,7 @@ src_unpack() { fi if use old-hd-rules; then - epatch "${FILESDIR}"/udev-151-readd-hd-rules.diff + epatch "${WORKDIR}"/udev-151-readd-hd-rules.diff fi sed_libexec_dir \ @@ -221,16 +222,16 @@ src_compile() { } src_install() { - local scriptdir="${FILESDIR}/151-r4" + local scriptdir="${WORKDIR}/151-r4" into / emake DESTDIR="${D}" install || die "make install failed" exeinto "${udev_libexec_dir}" - newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" - newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + newexe "${WORKDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" + newexe "${WORKDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ || die "move_tmp_persistent_rules.sh not installed properly" - newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \ + newexe "${WORKDIR}"/write_root_link_rule-125 write_root_link_rule \ || die "write_root_link_rule not installed properly" doexe "${scriptdir}"/shell-compat-KV.sh \ @@ -291,8 +292,8 @@ src_install() { || die "config file not installed properly" insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf - newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + newins "${WORKDIR}"/blacklist-146 blacklist.conf + newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf # convert /lib/udev to real used dir sed_libexec_dir \ diff --git a/sys-fs/udev/udev-164-r2.ebuild b/sys-fs/udev/udev-164-r2.ebuild index dae353c86bce..a3e4f371df66 100644 --- a/sys-fs/udev/udev-164-r2.ebuild +++ b/sys-fs/udev/udev-164-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-164-r2.ebuild,v 1.22 2012/05/16 03:21:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-164-r2.ebuild,v 1.23 2012/07/31 04:43:38 ssuominen Exp $ EAPI="1" @@ -18,7 +18,8 @@ else # please update testsys-tarball whenever udev-xxx/test/sys/ is changed SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 ) - mirror://gentoo/${scriptname}.tar.bz2" + mirror://gentoo/${scriptname}.tar.bz2 + http://dev.gentoo.org/~ssuominen/${PN}-gentoo-legacy-patchset-1.tar.bz2" [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" @@ -152,7 +153,7 @@ src_unpack() { cd "${S}" # Bug 413055 - epatch "${FILESDIR}"/udev-164-remove-v4l1.patch + epatch "${WORKDIR}"/udev-164-remove-v4l1.patch # backport some patches if [[ -n "${PATCHSET}" ]]; then @@ -255,8 +256,8 @@ src_install() { cd "${S}" insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf - newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + newins "${WORKDIR}"/blacklist-146 blacklist.conf + newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf # documentation dodoc ChangeLog README TODO || die "failed installing docs" diff --git a/sys-fs/udev/udev-171-r6.ebuild b/sys-fs/udev/udev-171-r6.ebuild index 261fc243c744..c33d377f992d 100644 --- a/sys-fs/udev/udev-171-r6.ebuild +++ b/sys-fs/udev/udev-171-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r6.ebuild,v 1.8 2012/07/30 22:36:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r6.ebuild,v 1.9 2012/07/31 04:43:38 ssuominen Exp $ EAPI=4 @@ -25,7 +25,8 @@ then KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux" # please update testsys-tarball whenever udev-xxx/test/sys/ is changed SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 - test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )" + test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 ) + http://dev.gentoo.org/~ssuominen/${PN}-gentoo-legacy-patchset-1.tar.bz2" if [[ -n "${PATCHSET}" ]] then SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" @@ -260,8 +261,8 @@ src_install() { cd "${S}" insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf - newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + newins "${WORKDIR}"/blacklist-146 blacklist.conf + newins "${WORKDIR}"/pnp-aliases pnp-aliases.conf # documentation dodoc ChangeLog README TODO @@ -278,7 +279,7 @@ src_install() { doconfd conf.d/* exeinto /lib/udev doexe helpers/* -doexe "${FILESDIR}"/shell-compat-KV.sh + doexe "${WORKDIR}"/shell-compat-KV.sh doinitd init.d/* insinto /etc/modprobe.d doins modprobe.d/* |