From: Roy Marples Date: Mon, 19 Jun 2006 12:43:56 +0000 (+0000) Subject: Remove the try command from udev-stop.sh, #136350 thanks to Paul Bredbury. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c59327338b7aaf32e0e909c858da723bbc63afe;p=gentoo.git Remove the try command from udev-stop.sh, #136350 thanks to Paul Bredbury. Package-Manager: portage-2.1.1_pre1-r1 --- diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index d3092e88281b..5b0d2a0636fe 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.196 2006/05/24 11:03:30 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.197 2006/06/19 12:43:56 uberlord Exp $ + +*udev-090-r1 (19 Jun 2006) +*udev-087-r1 (19 Jun 2006) +*udev-079-r2 (19 Jun 2006) + + 19 Jun 2006; Roy Marples files/udev-stop.sh, + +udev-079-r2.ebuild, +udev-087-r1.ebuild, +udev-090-r1.ebuild: + Remove the try command from udev-stop.sh, #136350 thanks to Paul Bredbury. 24 May 2006; Roy Marples files/udev-start-077-r2.sh, files/udev-start-077-r4.sh, files/udev-start-079.sh, diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 6af6aaf2e6bf..377ea5951ad3 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -50,10 +50,10 @@ AUX udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c SHA1 2558 MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c files/udev-start.sh 2460 SHA256 0527b03ac666dd9e4c94811b10d499f04b3f6f8ae2f03e6460727c1b570d985d files/udev-start.sh 2460 -AUX udev-stop.sh 2166 RMD160 ee2e56d409062b769645ccffd5fc0071c68d0a0e SHA1 b892f54acfa98d4a157939a42d95b309cc07b43a SHA256 1c99656da5e3619377942e0cce194cc89f9cad215d46122ff8c14398716e53d3 -MD5 1b706454dfb65512b5733e9f9a6ddb10 files/udev-stop.sh 2166 -RMD160 ee2e56d409062b769645ccffd5fc0071c68d0a0e files/udev-stop.sh 2166 -SHA256 1c99656da5e3619377942e0cce194cc89f9cad215d46122ff8c14398716e53d3 files/udev-stop.sh 2166 +AUX udev-stop.sh 2158 RMD160 0293fc9cd5de85b17624d38bd2c22a48c9722453 SHA1 6d918052006403d0fe1ab34041e36581cdeddcd4 SHA256 bb4fad16e3b58707565d9bb6652c94d917378dc0c462fd660957e17860313429 +MD5 b73dfbd0300c444f047f77914ca1c956 files/udev-stop.sh 2158 +RMD160 0293fc9cd5de85b17624d38bd2c22a48c9722453 files/udev-stop.sh 2158 +SHA256 bb4fad16e3b58707565d9bb6652c94d917378dc0c462fd660957e17860313429 files/udev-stop.sh 2158 AUX udev.conf 1183 RMD160 8f0e032c42ba31dff2044248f717299bc078e489 SHA1 6fb7675ba4c250387726ab8222a0822d487cf74d SHA256 c68a4a6cfa7242d4643862c7fb7cfa0e9fe3d8f61858f7a7380efbe4a37e4df4 MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183 RMD160 8f0e032c42ba31dff2044248f717299bc078e489 files/udev.conf 1183 @@ -134,12 +134,12 @@ DIST udev-072.tar.bz2 434594 DIST udev-073.tar.bz2 433317 DIST udev-077.tar.bz2 222315 RMD160 c686cc3996bd6fdff53d78c6cbeda46568c4bc11 SHA256 e9f05ebcf6f5cd07336704803016c9550e587d63d8f645ad3f3e4226d1709ae3 DIST udev-078.tar.bz2 222769 -DIST udev-079.tar.bz2 222080 RMD160 eadf12acb49cf55015031ad540cc399bde6be835 SHA256 66b398f6eca47c6c50ae19f9ae4721f2ae57c7686e6f90edc9c72e3780171bcc +DIST udev-079.tar.bz2 222080 RMD160 eadf12acb49cf55015031ad540cc399bde6be835 SHA1 03e19c1afaa8abdb31c1f6627179ae37805269f9 SHA256 66b398f6eca47c6c50ae19f9ae4721f2ae57c7686e6f90edc9c72e3780171bcc DIST udev-081.tar.bz2 194339 RMD160 2ad57d91751e7c2e225779cf029f082e6c0cfbad SHA256 089ebd9a9ae1fbc5c5c7c3c6d05c51c756c43f14f975a6b9e08b70b3f7dbd493 DIST udev-084.tar.bz2 190832 RMD160 d93b802a3b2f925ec9ac73045917d335c3044621 SHA256 73ea375a93169423dfca7ca3c125f9d6c422d0dcac917eea53a3217d177be4b4 DIST udev-085.tar.bz2 191553 RMD160 9f38b00d7f6ba44b0d0a429103250a2d29755db2 SHA256 d99e91b3a033111e37479ad2f85c4d161cb26a9762a4314231b4aba4b3fab3f7 DIST udev-086.tar.bz2 191824 RMD160 1cc8df74fc476b1123de52e24c2baa42a8b14305 SHA256 98cc9890100cfb5a656ccf5f21a5a8667fbc02f0e85d8a519089785695a1e59d -DIST udev-087.tar.bz2 190053 RMD160 3eefbc4bb4df3ffe3678cd1a8c57d247d6e59dcd SHA256 d91eac8fad04b27d1146b579e4dc9ed0aee142a35d87af2c683b47ea95d80995 +DIST udev-087.tar.bz2 190053 RMD160 3eefbc4bb4df3ffe3678cd1a8c57d247d6e59dcd SHA1 4564190ad6d6b38f94effdfe0ef1eebbcef2056b SHA256 d91eac8fad04b27d1146b579e4dc9ed0aee142a35d87af2c683b47ea95d80995 DIST udev-089.tar.bz2 191032 RMD160 3e845904ce1c24b407c616f0cb024d758a7afbe2 SHA256 cee32e4392d0c3ea84838e98ead8ca2a031c332126e0ff5321b981135b7e76fd DIST udev-090.tar.bz2 192213 RMD160 77c1cd3cd71d781daf420824723cc520c75f41c8 SHA1 c5072cb2eaa4cd35b12685bd786c6c56ffbfedd7 SHA256 fd938b4144093261ed0437a6a7ce167526113ead596059ebae779b3fe219b4b3 EBUILD udev-068-r1.ebuild 6698 RMD160 16b86a0149c8cd49d75211049521c8520145503a SHA1 7d15be5b8b91acf55aa180990218c1b23280d253 SHA256 8813968cc7f3966b301307298d805cf47109ee2abfdc7d202b2f982399f59af4 @@ -198,6 +198,10 @@ EBUILD udev-079-r1.ebuild 7520 RMD160 e7b5993d286db8ab886d2b87110cfd618512a7ec S MD5 c4261697d1e9bd76064b59cee82f292a udev-079-r1.ebuild 7520 RMD160 e7b5993d286db8ab886d2b87110cfd618512a7ec udev-079-r1.ebuild 7520 SHA256 e35cf80a01b60e95a681862ec262db717907130009058cd6b50204683652520a udev-079-r1.ebuild 7520 +EBUILD udev-079-r2.ebuild 7523 RMD160 bc3a75a2205cbe092ec431eaf474cb1f4959d4fe SHA1 b10bb23e64edc1a43b890f06c3f71a4e7c85ba9e SHA256 14a34689b36d1be9ffd953eedf20ee906b8638b0967b7148b4d0023d765da90f +MD5 3a6af6ceddbbd1a93002a240a8e6b930 udev-079-r2.ebuild 7523 +RMD160 bc3a75a2205cbe092ec431eaf474cb1f4959d4fe udev-079-r2.ebuild 7523 +SHA256 14a34689b36d1be9ffd953eedf20ee906b8638b0967b7148b4d0023d765da90f udev-079-r2.ebuild 7523 EBUILD udev-079.ebuild 7531 RMD160 39ed3b56f17c076a757559bfb314b27f431e9591 SHA1 388d015291fe74b7ba6e42a93f05126a102c3751 SHA256 e293a17d7ecd236fc0b0cd3619a9de3b9255ca6b047796752c1953ec5c14db36 MD5 ef95a1258270633facc3296d1d6daf97 udev-079.ebuild 7531 RMD160 39ed3b56f17c076a757559bfb314b27f431e9591 udev-079.ebuild 7531 @@ -222,6 +226,10 @@ EBUILD udev-086.ebuild 7514 RMD160 e61493c51ae0423ce429557c4ea38c9fb1984949 SHA1 MD5 a31e395c26965642faf7a8e2ad14a5fc udev-086.ebuild 7514 RMD160 e61493c51ae0423ce429557c4ea38c9fb1984949 udev-086.ebuild 7514 SHA256 fe8d286ed7dd71982ae13dbe108fe9d9550e6f403ba33b0e1156cee145dc29d9 udev-086.ebuild 7514 +EBUILD udev-087-r1.ebuild 7507 RMD160 c32e4aaba633e8ff6087066ac140c41f2fd4a6c2 SHA1 ec8cd6e1a413bc6dc57a4b1cb2d3ed2aecd7f3ed SHA256 1fc7b8f41e19a104bda51437fbe8025a4136537bcb290be8d7a39c55a613485c +MD5 e93f1cfad8016257fa794b931b79f26b udev-087-r1.ebuild 7507 +RMD160 c32e4aaba633e8ff6087066ac140c41f2fd4a6c2 udev-087-r1.ebuild 7507 +SHA256 1fc7b8f41e19a104bda51437fbe8025a4136537bcb290be8d7a39c55a613485c udev-087-r1.ebuild 7507 EBUILD udev-087.ebuild 7501 RMD160 d5a3abdad575bc09b92d7049d810b776a469af96 SHA1 7479a6bc3197557fc5cf9db0d1fb406f56411da7 SHA256 a516a01ae689291428c7a49353114ce71311ce9d2c4df273faad1701be5c2360 MD5 5777886b7aac35bfeb284e9a53fc2878 udev-087.ebuild 7501 RMD160 d5a3abdad575bc09b92d7049d810b776a469af96 udev-087.ebuild 7501 @@ -238,14 +246,18 @@ EBUILD udev-089.ebuild 8082 RMD160 8a2db044b0e53f0545b4fc124cdb77e2e5d4f50b SHA1 MD5 5389c6d6568b322f8de41f87124369db udev-089.ebuild 8082 RMD160 8a2db044b0e53f0545b4fc124cdb77e2e5d4f50b udev-089.ebuild 8082 SHA256 75ec8b137530c984a027f9ba669591052b7957a4d58361bce0618a7f5b0669d9 udev-089.ebuild 8082 +EBUILD udev-090-r1.ebuild 9718 RMD160 c7ea94444241a59fbc76bff7a7dd37615773a46d SHA1 49eac9bd0c433efe971b7320beb3d97f2515ae14 SHA256 08225d0c4d65b20b69812ac1cb0bea11d07ae16922ffda507bff289ec90bce48 +MD5 fa41c9117819fa15cb74d3e3ecac10c9 udev-090-r1.ebuild 9718 +RMD160 c7ea94444241a59fbc76bff7a7dd37615773a46d udev-090-r1.ebuild 9718 +SHA256 08225d0c4d65b20b69812ac1cb0bea11d07ae16922ffda507bff289ec90bce48 udev-090-r1.ebuild 9718 EBUILD udev-090.ebuild 9713 RMD160 71719422dc61e55d208e5e39373a5e846efd7ec6 SHA1 f8c4849023046c718081b1b332b1e4f36978050f SHA256 a33ea370e032bba5e2ae244b1cba23d959eda6c56140710598c21f63f74ce544 MD5 af0949a9b46f1eefe8070907281437d9 udev-090.ebuild 9713 RMD160 71719422dc61e55d208e5e39373a5e846efd7ec6 udev-090.ebuild 9713 SHA256 a33ea370e032bba5e2ae244b1cba23d959eda6c56140710598c21f63f74ce544 udev-090.ebuild 9713 -MISC ChangeLog 35485 RMD160 c35f9659c4fd32ecce7d15e9cbaf06e606891bec SHA1 8d8ccb9429d771a82c771e5e543b6b2413f67a11 SHA256 8fec5cef21e3a83932031f66fce025caf14c40bb2e4c125fa431c0d7b848a547 -MD5 8f4c8e680633640de3f5d1fb9f538d56 ChangeLog 35485 -RMD160 c35f9659c4fd32ecce7d15e9cbaf06e606891bec ChangeLog 35485 -SHA256 8fec5cef21e3a83932031f66fce025caf14c40bb2e4c125fa431c0d7b848a547 ChangeLog 35485 +MISC ChangeLog 35779 RMD160 3e94365b0a88afdefd3ab35fe6ffb599a35a4218 SHA1 c3ea5e5970eca9ceda8b10d074a59ecfdc58e2e3 SHA256 706d9120f7c6fc78bdfc95c25f67dd25092545104f1ebe1f327c058fe39eeecd +MD5 4e42d52b8e451cd42c6c9ca28330fbb4 ChangeLog 35779 +RMD160 3e94365b0a88afdefd3ab35fe6ffb599a35a4218 ChangeLog 35779 +SHA256 706d9120f7c6fc78bdfc95c25f67dd25092545104f1ebe1f327c058fe39eeecd ChangeLog 35779 MISC metadata.xml 260 RMD160 f1b0916156eade656b558b7507109b69ed78d394 SHA1 3e34c50d52c32d6524b8de2d553e62a40798c043 SHA256 31722725c8bf774ad90600f7a3f50f2ca76c1396aad6888ce1cc08ce981b1552 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260 RMD160 f1b0916156eade656b558b7507109b69ed78d394 metadata.xml 260 @@ -295,6 +307,9 @@ SHA256 5484b32be7d169e1c27b8eb03df48fe046f2904af1e26894e682ad07e9c5599a files/di MD5 87b216e9c41a2939b053a3c19c1d40ba files/digest-udev-079-r1 229 RMD160 c896542fdd57928b97d67f8385e3f0f0a12e1a11 files/digest-udev-079-r1 229 SHA256 5484b32be7d169e1c27b8eb03df48fe046f2904af1e26894e682ad07e9c5599a files/digest-udev-079-r1 229 +MD5 87b216e9c41a2939b053a3c19c1d40ba files/digest-udev-079-r2 229 +RMD160 c896542fdd57928b97d67f8385e3f0f0a12e1a11 files/digest-udev-079-r2 229 +SHA256 5484b32be7d169e1c27b8eb03df48fe046f2904af1e26894e682ad07e9c5599a files/digest-udev-079-r2 229 MD5 d1e835cc9caca78509b6f4a85e26a824 files/digest-udev-081 229 RMD160 96b95b701dbf44a8b03c0e511d07c64d9eeec1ed files/digest-udev-081 229 SHA256 b5570aea1bc583dfb96b8aa46082873500a6a19f175b4ec4ddb0be0f8c4fb1a1 files/digest-udev-081 229 @@ -313,6 +328,9 @@ SHA256 9ae4eb44bfe1919a0ee26c31a7a81cacca7eee3b3cb7ef6a0483c24019467edd files/di MD5 c8ec90a2827ce8897e34a140ec03e100 files/digest-udev-087 229 RMD160 5427cd59378b4ad0018502ffbd537d53186a508e files/digest-udev-087 229 SHA256 70ee083c84b52a4ca757cd6cc5ccae2905c9184d4f533fbdfe21b647760097d1 files/digest-udev-087 229 +MD5 c8ec90a2827ce8897e34a140ec03e100 files/digest-udev-087-r1 229 +RMD160 5427cd59378b4ad0018502ffbd537d53186a508e files/digest-udev-087-r1 229 +SHA256 70ee083c84b52a4ca757cd6cc5ccae2905c9184d4f533fbdfe21b647760097d1 files/digest-udev-087-r1 229 MD5 9dc9ff90ebbc4e57f50f59de28f693ac files/digest-udev-089 229 RMD160 f9e7142287acee4a3ff353c50ef5965538c59562 files/digest-udev-089 229 SHA256 e12b90573d11e8ff79ac99338d536d3e1be647a4c6de7c664d166a7e9dcd6e3c files/digest-udev-089 229 @@ -325,3 +343,6 @@ SHA256 e12b90573d11e8ff79ac99338d536d3e1be647a4c6de7c664d166a7e9dcd6e3c files/di MD5 08479620eba0bf6e20ed51ca3daa2e25 files/digest-udev-090 229 RMD160 5b046f0c83c87de916417d0852aa47096b1e9418 files/digest-udev-090 229 SHA256 50879961dd1c70fe88683704a50b768edeccbbc018962031a0f4f54f10b6cc6f files/digest-udev-090 229 +MD5 08479620eba0bf6e20ed51ca3daa2e25 files/digest-udev-090-r1 229 +RMD160 5b046f0c83c87de916417d0852aa47096b1e9418 files/digest-udev-090-r1 229 +SHA256 50879961dd1c70fe88683704a50b768edeccbbc018962031a0f4f54f10b6cc6f files/digest-udev-090-r1 229 diff --git a/sys-fs/udev/files/digest-udev-079-r2 b/sys-fs/udev/files/digest-udev-079-r2 new file mode 100644 index 000000000000..f8bef847bfa9 --- /dev/null +++ b/sys-fs/udev/files/digest-udev-079-r2 @@ -0,0 +1,3 @@ +MD5 981fc92fd2eeb4d4d13c182c447af6bf udev-079.tar.bz2 222080 +RMD160 eadf12acb49cf55015031ad540cc399bde6be835 udev-079.tar.bz2 222080 +SHA256 66b398f6eca47c6c50ae19f9ae4721f2ae57c7686e6f90edc9c72e3780171bcc udev-079.tar.bz2 222080 diff --git a/sys-fs/udev/files/digest-udev-087-r1 b/sys-fs/udev/files/digest-udev-087-r1 new file mode 100644 index 000000000000..df46535b9e4b --- /dev/null +++ b/sys-fs/udev/files/digest-udev-087-r1 @@ -0,0 +1,3 @@ +MD5 8659e14a4f376b33134c72df180bfbbe udev-087.tar.bz2 190053 +RMD160 3eefbc4bb4df3ffe3678cd1a8c57d247d6e59dcd udev-087.tar.bz2 190053 +SHA256 d91eac8fad04b27d1146b579e4dc9ed0aee142a35d87af2c683b47ea95d80995 udev-087.tar.bz2 190053 diff --git a/sys-fs/udev/files/digest-udev-090-r1 b/sys-fs/udev/files/digest-udev-090-r1 new file mode 100644 index 000000000000..8e7eae04b7fe --- /dev/null +++ b/sys-fs/udev/files/digest-udev-090-r1 @@ -0,0 +1,3 @@ +MD5 44acf418a23b0be826aa55828ada07db udev-090.tar.bz2 192213 +RMD160 77c1cd3cd71d781daf420824723cc520c75f41c8 udev-090.tar.bz2 192213 +SHA256 fd938b4144093261ed0437a6a7ce167526113ead596059ebae779b3fe219b4b3 udev-090.tar.bz2 192213 diff --git a/sys-fs/udev/files/udev-stop.sh b/sys-fs/udev/files/udev-stop.sh index d2eb5b150896..e031cd7b8fca 100755 --- a/sys-fs/udev/files/udev-stop.sh +++ b/sys-fs/udev/files/udev-stop.sh @@ -51,8 +51,8 @@ main() { 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 - try tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}" - try mv -f "${device_tarball}" /lib/udev-state/devices.tar.bz2 + tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}" + mv -f "${device_tarball}" /lib/udev-state/devices.tar.bz2 else rm -f /lib/udev-state/devices.tar.bz2 fi diff --git a/sys-fs/udev/udev-079-r2.ebuild b/sys-fs/udev/udev-079-r2.ebuild new file mode 100644 index 000000000000..a7de1d3a8615 --- /dev/null +++ b/sys-fs/udev/udev-079-r2.ebuild @@ -0,0 +1,226 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-079-r2.ebuild,v 1.1 2006/06/19 12:43:56 uberlord Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" +IUSE="selinux" + +DEPEND="sys-apps/hotplug-base" +RDEPEND="${DEPEND} + >=sys-apps/baselayout-1.11.14" +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +src_unpack() { + unpack ${A} + + cd "${S}" + + # patches go here... + #epatch ${FILESDIR}/${P}-udev_volume_id.patch + + # No need to clutter the logs ... + sed -ie '/^DEBUG/ c\DEBUG = false' Makefile + # Do not use optimization flags from the package + sed -ie 's|$(OPTIMIZATION)||g' Makefile + + # Make sure there is no sudden changes to udev.rules.gentoo + # (more for my own needs than anything else ...) + MD5=`md5sum < "${S}/etc/udev/gentoo/udev.rules"` + MD5=${MD5/ -/} + if [ "${MD5}" != "f849a8ebf727167fddbc763ade8c0405" ] + then + echo + eerror "gentoo/udev.rules has been updated, please validate!" + die "gentoo/udev.rules has been updated, please validate!" + fi +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + local myconf= + local extras="extras/scsi_id extras/volume_id extras/ata_id extras/run_directory extras/usb_id extras/floppy extras/cdrom_id extras/firmware" + + use selinux && myconf="${myconf} USE_SELINUX=true" + + # Not everyone has full $CHOST-{ld,ar,etc...} yet + local mycross="" + type -p ${CHOST}-ar && mycross=${CHOST}- + + # Do not work with emake + make \ + EXTRAS="${extras}" \ + udevdir="/dev/" \ + CROSS=${mycross} \ + ${myconf} || die +} + +src_install() { + # we install everything by "hand" and don't rely on the udev Makefile to do + # it for us (why? it's easier that way...) + dobin udevinfo + dobin udevtest + dobin udevmonitor + into / + dosbin udev + dosbin udevd + dosbin udevsend + dosbin udevstart + dosbin udevcontrol + dosbin extras/run_directory/udev_run_devd + dosbin extras/run_directory/udev_run_hotplugd + dosbin extras/ata_id/ata_id + dosbin extras/volume_id/vol_id + dosbin extras/scsi_id/scsi_id + dosbin extras/usb_id/usb_id + dosbin extras/cdrom_id/cdrom_id + dosbin extras/path_id + dosbin extras/floppy/create_floppy_devices + dosbin extras/firmware/firmware_helper + + #exeinto /etc/udev/scripts + exeinto /lib/udev + #doexe extras/ide-devfs.sh + #doexe extras/scsi-devfs.sh + doexe extras/raid-devfs.sh + + # Our udev config file + insinto /etc/udev + newins ${FILESDIR}/udev.conf.post_059 udev.conf + + # Our rules files + insinto /etc/udev/rules.d/ + #newins etc/udev/gentoo/udev.rules 50-udev.rules + newins ${FILESDIR}/udev.rules-078 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules + + # scsi_id configuration + insinto /etc + doins extras/scsi_id/scsi_id.config + + # set up symlinks in /etc/hotplug.d/default + dodir /etc/hotplug.d/default + dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug + + # set up the /etc/dev.d directory tree + dodir /etc/dev.d/default + dodir /etc/dev.d/net + exeinto /etc/dev.d/net + doexe extras/run_directory/dev.d/net/hotplug.dev + + # all of the man pages + doman *.8 + doman extras/ata_id/ata_id.8 + doman extras/edd_id/edd_id.8 + doman extras/scsi_id/scsi_id.8 + doman extras/volume_id/vol_id.8 + doman extras/dasd_id/dasd_id.8 + doman extras/cdrom_id/cdrom_id.8 + + # our udev hooks into the rc system + insinto /lib/rcscripts/addons + newins "${FILESDIR}"/udev-start-079.sh udev-start.sh + doins "${FILESDIR}"/udev-stop.sh + + dodoc ChangeLog FAQ README TODO RELEASE-NOTES + dodoc docs/{overview,udev_vs_devfs} + dodoc docs/writing_udev_rules/* + + newdoc extras/volume_id/README README_volume_id + + # Create some nodes that we know we need. + # set the time/date so we can see in /dev which ones we copied over + # in the udev-start.sh script + mkdir ${D}/lib/udev/devices + + mknod ${D}/lib/udev/devices/null c 1 3 + chmod 666 ${D}/lib/udev/devices/null + touch -t 200010220101 ${D}/lib/udev/devices/null + + mknod ${D}/lib/udev/devices/zero c 1 5 + chmod 666 ${D}/lib/udev/devices/zero + touch -t 200010220101 ${D}/lib/udev/devices/zero + + mknod ${D}/lib/udev/devices/console c 5 1 + chmod 600 ${D}/lib/udev/devices/console + chown root:tty ${D}/lib/udev/devices/console + touch -t 200010220101 ${D}/lib/udev/devices/console +} + +pkg_preinst() { + if [ -f "${ROOT}/etc/udev/udev.config" -a \ + ! -f "${ROOT}/etc/udev/udev.rules" ] + then + mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi +} + +pkg_postinst() { + if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ] + then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + ewarn "Note: If you are upgrading from a version of udev prior to 046" + ewarn " and you rely on the output of udevinfo for anything, please" + ewarn " either run 'udevstart' now, or reboot, in order to get a" + ewarn " up-to-date udev database." + ewarn + ewarn "Note: If you are upgrading from a version of udev prior to 050" + ewarn " and you had written some custom permissions rules, please" + ewarn " realize that the permission rules are now part of the main" + ewarn " udev rules files and are not stand-alone anymore. This means" + ewarn " you need to rewrite them." + ewarn + ewarn "Note: If you are upgrading from a version of udev prior to 057" + ewarn " and you have written custom rules, and rely on the etc/dev.d/" + ewarn " functionality, please read the RELEASE-NOTES file for details" + ewarn " on what has changed with this feature, and how to change your" + ewarn " rules to work properly." + ewarn + ewarn "Note: If you are upgrading from a version of udev prior to 059" + ewarn " and you have written custom rules, and rely on the etc/dev.d/" + ewarn " functionality, or the etc/hotplug.d functionality, or just" + ewarn " want to write some very cool and power udev rules, please " + ewarn " read the RELEASE-NOTES file for details on what has changed" + ewarn " with this feature, and how to change your rules to work properly." + ewarn + ewarn "Note: If you are upgrading from a version of udev prior to 063" + ewarn " and you use the devfs-style names for your block devices" + ewarn " or use devfs-style names in /etc/inittab or /etc/securetty or" + ewarn " your GRUB or LILO kernel boot command line, you need to" + ewarn " change them back to LSB compliant names, as the devfs names are" + ewarn " now gone. If you wish to use some persistent names for your" + ewarn " block devices, look at the symlinks in /dev/disk/ for the names" + ewarn " you can use." + + einfo + einfo "For more information on udev on Gentoo, writing udev rules, and" + einfo " fixing known issues visit:" + einfo " http://www.gentoo.org/doc/en/udev-guide.xml" +} diff --git a/sys-fs/udev/udev-087-r1.ebuild b/sys-fs/udev/udev-087-r1.ebuild new file mode 100644 index 000000000000..c9fc68b4c10a --- /dev/null +++ b/sys-fs/udev/udev-087-r1.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-087-r1.ebuild,v 1.1 2006/06/19 12:43:56 uberlord Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" +IUSE="selinux" + +DEPEND="sys-apps/hotplug-base" +RDEPEND="${DEPEND} + >=sys-apps/baselayout-1.11.14" +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +src_unpack() { + unpack ${A} + + cd "${S}" + + # patches go here... + #epatch ${FILESDIR}/${P}-udev_volume_id.patch + + # No need to clutter the logs ... + sed -ie '/^DEBUG/ c\DEBUG = false' Makefile + # Do not use optimization flags from the package + sed -ie 's|$(OPTIMIZATION)||g' Makefile + + # Make sure there is no sudden changes to udev.rules.gentoo + # (more for my own needs than anything else ...) + MD5=`md5sum < "${S}/etc/udev/gentoo/udev.rules"` + MD5=${MD5/ -/} + if [ "${MD5}" != "590d3e6346938e3b608237973f4f1805" ] + then + echo + eerror "gentoo/udev.rules has been updated, please validate!" + die "gentoo/udev.rules has been updated, please validate!" + fi +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + local myconf= + local extras="extras/scsi_id extras/volume_id extras/ata_id extras/run_directory extras/usb_id extras/floppy extras/cdrom_id extras/firmware" + + use selinux && myconf="${myconf} USE_SELINUX=true" + + # Not everyone has full $CHOST-{ld,ar,etc...} yet + local mycross="" + type -p ${CHOST}-ar && mycross=${CHOST}- + + # Do not work with emake + make \ + EXTRAS="${extras}" \ + udevdir="/dev/" \ + CROSS=${mycross} \ + ${myconf} || die +} + +src_install() { + # we install everything by "hand" and don't rely on the udev Makefile to do + # it for us (why? it's easier that way...) + dobin udevinfo + dobin udevtest + dobin udevmonitor + into / + dosbin udev + dosbin udevd + dosbin udevsend + dosbin udevstart + dosbin udevcontrol + dosbin extras/run_directory/udev_run_devd + dosbin extras/run_directory/udev_run_hotplugd + dosbin extras/ata_id/ata_id + dosbin extras/volume_id/vol_id + dosbin extras/scsi_id/scsi_id + dosbin extras/usb_id/usb_id + dosbin extras/cdrom_id/cdrom_id + dosbin extras/path_id + dosbin extras/floppy/create_floppy_devices + dosbin extras/firmware/firmware_helper + + #exeinto /etc/udev/scripts + exeinto /lib/udev + #doexe extras/ide-devfs.sh + #doexe extras/scsi-devfs.sh + doexe extras/raid-devfs.sh + + # Our udev config file + insinto /etc/udev + newins ${FILESDIR}/udev.conf.post_081 udev.conf + + # Our rules files + insinto /etc/udev/rules.d/ + newins etc/udev/gentoo/udev.rules 50-udev.rules + #newins ${FILESDIR}/udev.rules-084 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules + + # scsi_id configuration + insinto /etc + doins extras/scsi_id/scsi_id.config + + # set up symlinks in /etc/hotplug.d/default + dodir /etc/hotplug.d/default + dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug + + # set up the /etc/dev.d directory tree + dodir /etc/dev.d/default + dodir /etc/dev.d/net + exeinto /etc/dev.d/net + doexe extras/run_directory/dev.d/net/hotplug.dev + + # all of the man pages + doman *.7 + doman *.8 + doman extras/ata_id/ata_id.8 + doman extras/edd_id/edd_id.8 + doman extras/scsi_id/scsi_id.8 + doman extras/volume_id/vol_id.8 + doman extras/dasd_id/dasd_id.8 + doman extras/cdrom_id/cdrom_id.8 + + # our udev hooks into the rc system + insinto /lib/rcscripts/addons + newins "${FILESDIR}"/udev-start-079.sh udev-start.sh + doins "${FILESDIR}"/udev-stop.sh + + dodoc ChangeLog FAQ README TODO RELEASE-NOTES + dodoc docs/{overview,udev_vs_devfs} + dodoc docs/writing_udev_rules/* + + newdoc extras/volume_id/README README_volume_id + + # Create some nodes that we know we need. + # set the time/date so we can see in /dev which ones we copied over + # in the udev-start.sh script + mkdir ${D}/lib/udev/devices + + mknod ${D}/lib/udev/devices/null c 1 3 + chmod 666 ${D}/lib/udev/devices/null + touch -t 200010220101 ${D}/lib/udev/devices/null + + mknod ${D}/lib/udev/devices/zero c 1 5 + chmod 666 ${D}/lib/udev/devices/zero + touch -t 200010220101 ${D}/lib/udev/devices/zero + + mknod ${D}/lib/udev/devices/console c 5 1 + chmod 600 ${D}/lib/udev/devices/console + chown root:tty ${D}/lib/udev/devices/console + touch -t 200010220101 ${D}/lib/udev/devices/console +} + +pkg_preinst() { + if [ -f "${ROOT}/etc/udev/udev.config" -a \ + ! -f "${ROOT}/etc/udev/udev.rules" ] + then + mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi +} + +pkg_postinst() { + if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ] + then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + if has_version '/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + if has_version '