Backported non-modular kernel fix toget it into release, Bug #168322.

Package-Manager: portage-2.1.2.2

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index becf70ddadc0ec5d7900bf48b95b3a1d33ab3611..19f2870bc4f4e2186b7ac9f7f44da049e3cc1d9d 100644 (file)
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.285 2007/03/14 15:51:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.286 2007/03/17 10:42:15 zzam Exp $
+
+  17 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
+  files/modprobe-104-r12.sh:
+  Backported non-modular kernel fix toget it into release, Bug #168322.
 
   14 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
   -files/udev.rules-104-r7, -files/udev-start-104-r5.sh,

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 6e48bf3881936151dd5c51f4a63ea60f3b7ba137..23a3bd5f81a884e7986a27ca69094e544fcb4cfe 100644 (file)
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -21,10 +21,10 @@ AUX blacklist 601 RMD160 9410dacd33fc35e88cfa952a2b50bda2a4b0db43 SHA1 9db44ff47
 MD5 e9e7b3f04a6a2d86022a34c54cbcf2ac files/blacklist 601
 RMD160 9410dacd33fc35e88cfa952a2b50bda2a4b0db43 files/blacklist 601
 SHA256 29855c545ec060203d28532f766e9d757145c3d2d8c735bf20f4f0a555af97df files/blacklist 601
-AUX modprobe-104-r12.sh 827 RMD160 99d2f95331b57412596d402798aeb269d8c2c3da SHA1 191a5d80d49d26f2483617882e89bb855af86d79 SHA256 3ad266d27d48c0ef7e1281e6b449580427789f4a2bb15970d765c95bc26aec40
-MD5 fa41f3306fe915917a496c9b6e263112 files/modprobe-104-r12.sh 827
-RMD160 99d2f95331b57412596d402798aeb269d8c2c3da files/modprobe-104-r12.sh 827
-SHA256 3ad266d27d48c0ef7e1281e6b449580427789f4a2bb15970d765c95bc26aec40 files/modprobe-104-r12.sh 827
+AUX modprobe-104-r12.sh 916 RMD160 af55573a195a101c8462b8184685f9219285adc1 SHA1 b3d13cbdf196209c88e0181a73c0b233c5795b54 SHA256 a25bc7876ccdd227c7f4c69f2b1fbdf57ed9836078212dac08521e6696531116
+MD5 23c8ca5fdbe163a126588b14c12ad989 files/modprobe-104-r12.sh 916
+RMD160 af55573a195a101c8462b8184685f9219285adc1 files/modprobe-104-r12.sh 916
+SHA256 a25bc7876ccdd227c7f4c69f2b1fbdf57ed9836078212dac08521e6696531116 files/modprobe-104-r12.sh 916
 AUX modprobe-105.sh 983 RMD160 946919b0a6c3788207f5e4f4fa7e2c15bf1b66b5 SHA1 de5b95e5d3386e0930e12e7569eac614e0e4a945 SHA256 8a238646dd769481a0c69973b21c5833abdba8cbd98f19c9dee5e45f197b7604
 MD5 0aba148adab1a0f102f2cda3489d15e3 files/modprobe-105.sh 983
 RMD160 946919b0a6c3788207f5e4f4fa7e2c15bf1b66b5 files/modprobe-105.sh 983
@@ -324,10 +324,10 @@ EBUILD udev-106-r4.ebuild 9920 RMD160 231724604dc98cb6652bc4a80a7ecc20a0554b8b S
 MD5 9aeee7fb6c115aa908add98f9980f262 udev-106-r4.ebuild 9920
 RMD160 231724604dc98cb6652bc4a80a7ecc20a0554b8b udev-106-r4.ebuild 9920
 SHA256 526d39735bb166d191207cf2ad1775b324dee69fa18b764a1e7e1db2b70b0c88 udev-106-r4.ebuild 9920
-MISC ChangeLog 53603 RMD160 56135de91da489c6b7caa0632d055e74af3c8d74 SHA1 0f4000791c5da5e1cd730a8ab4e098437d1aecbb SHA256 dac668f1b446c526b5cc5f769d785e68ab0410e2988f19de38a7487190fd6008
-MD5 8f7aa0a0f057ed1080fb773ea624e5d6 ChangeLog 53603
-RMD160 56135de91da489c6b7caa0632d055e74af3c8d74 ChangeLog 53603
-SHA256 dac668f1b446c526b5cc5f769d785e68ab0410e2988f19de38a7487190fd6008 ChangeLog 53603
+MISC ChangeLog 53758 RMD160 1df6ffdb1db3ef7b299094a2493edd409a206f5c SHA1 2c23eb4bddd756b34150a4aa770a7b21b9c87d24 SHA256 c4e11dad31d4c365f15c098047ffd65f20bbbb5cd94adedbeedabff783545788
+MD5 f30c2ec1c180c14edcc37737cae28b5e ChangeLog 53758
+RMD160 1df6ffdb1db3ef7b299094a2493edd409a206f5c ChangeLog 53758
+SHA256 c4e11dad31d4c365f15c098047ffd65f20bbbb5cd94adedbeedabff783545788 ChangeLog 53758
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -380,7 +380,7 @@ SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+BoVt2vP6XvVdOcRApPfAKC2DHbbU2xa3XOXVwiM0bbxPsMNegCfZfWx
-AFl14yOCxInqeQirVON+zOQ=
-=Id1G
+iD8DBQFF+8YNt2vP6XvVdOcRAvHyAJ9EGqMSeNxt8wMtTipXc4GzhnYvtwCg3DF0
+1S3NmdNzrPdLA39QlWdikBs=
+=3KxS
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/udev/files/modprobe-104-r12.sh b/sys-fs/udev/files/modprobe-104-r12.sh
index c22a10a62aa259c799910dbebd0ad404b7be0c92..500fd9c8e527b594083114efdf387f661010a869 100755 (executable)
--- a/sys-fs/udev/files/modprobe-104-r12.sh
+++ b/sys-fs/udev/files/modprobe-104-r12.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Do not continue for non-modular kernel - Bug #168322
+[ ! -f /proc/modules ] && exit 0
+
 if [[ -e /dev/.udev_populate ]]; then
        # Enable verbose while called from udev-addon-start
        source /dev/.udev_populate