tweak genkernel find a little

Package-Manager: portage-2.1.2-r6

diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest
index 6eef351a63b6e41be5ee4ad0482a1ef9006ae875..8a927cc5ebc6639baddd065a36e0561f2caa4bcf 100644 (file)
--- a/sys-apps/eject/Manifest
+++ b/sys-apps/eject/Manifest
@@ -106,18 +106,18 @@ EBUILD eject-2.1.4.ebuild 988 RMD160 c410fab73e9ff9538a05956011c3efc270a5c665 SH
 MD5 8aa91233794536e157a7b704e931acc0 eject-2.1.4.ebuild 988
 RMD160 c410fab73e9ff9538a05956011c3efc270a5c665 eject-2.1.4.ebuild 988
 SHA256 c2daf06a9468b10f72e00a02787ae5e177e0564d6e5a5acb7c521cc188fa0ed1 eject-2.1.4.ebuild 988
-EBUILD eject-2.1.5-r1.ebuild 1162 RMD160 6b5668c03d6bce03d46362bd4e7768ea2bb4c294 SHA1 d3f93c9494f85cdee9bbaca7c9b0478e5062dae1 SHA256 cac7f1a4f9311aa3888596cf9e828ffb2f0cd0cf0220cee1874513fb092aaa23
-MD5 5287f29bcdf2153a89afaa62e74467c0 eject-2.1.5-r1.ebuild 1162
-RMD160 6b5668c03d6bce03d46362bd4e7768ea2bb4c294 eject-2.1.5-r1.ebuild 1162
-SHA256 cac7f1a4f9311aa3888596cf9e828ffb2f0cd0cf0220cee1874513fb092aaa23 eject-2.1.5-r1.ebuild 1162
+EBUILD eject-2.1.5-r1.ebuild 1165 RMD160 703f4cf351101a17dcd9d2189074a2f5ae7874e8 SHA1 8ebe8f1965bbdec2eb9a4b218469624a120fe74d SHA256 6fd714622efb922975d5aa5f161aee1d3cadcf766605547509c6e587b10e5c4a
+MD5 5d014982423b65196125dfccc64de797 eject-2.1.5-r1.ebuild 1165
+RMD160 703f4cf351101a17dcd9d2189074a2f5ae7874e8 eject-2.1.5-r1.ebuild 1165
+SHA256 6fd714622efb922975d5aa5f161aee1d3cadcf766605547509c6e587b10e5c4a eject-2.1.5-r1.ebuild 1165
 EBUILD eject-2.1.5.ebuild 981 RMD160 2f7f952f3963b48271282298302f3a06de7ea0a1 SHA1 51b6a5a7d4f76321186b0544a4c79092efebbd02 SHA256 f82110a15737e2f214dbbd51cc564a3a833c912795d565d7677e8e425f5c3427
 MD5 1c6c7957781dfbdf41830775b6fbf7ed eject-2.1.5.ebuild 981
 RMD160 2f7f952f3963b48271282298302f3a06de7ea0a1 eject-2.1.5.ebuild 981
 SHA256 f82110a15737e2f214dbbd51cc564a3a833c912795d565d7677e8e425f5c3427 eject-2.1.5.ebuild 981
-MISC ChangeLog 9334 RMD160 87108d8cea0baabfbac1e3caff9434353775156a SHA1 f13af020aef503cb1a2d0de5a673ae65742a9840 SHA256 bcfb088a1bac2cffcec6735a1d4eb43560552b43031e9853fc272240b3fbe833
-MD5 cfe68dfcd08df19a029d1e1f90fd9036 ChangeLog 9334
-RMD160 87108d8cea0baabfbac1e3caff9434353775156a ChangeLog 9334
-SHA256 bcfb088a1bac2cffcec6735a1d4eb43560552b43031e9853fc272240b3fbe833 ChangeLog 9334
+MISC ChangeLog 9436 RMD160 ab02674bc20e054c19718f406c6290d4f9758213 SHA1 179e483854d3667182f9e77d39d010aa8aa8b386 SHA256 71a83ed8ce693c234988a96450f3d29e0bb04f25a20e5c8d22399cbe79ffd762
+MD5 0e9ec0511f5574af3c65715ebadd7feb ChangeLog 9436
+RMD160 ab02674bc20e054c19718f406c6290d4f9758213 ChangeLog 9436
+SHA256 71a83ed8ce693c234988a96450f3d29e0bb04f25a20e5c8d22399cbe79ffd762 ChangeLog 9436
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164

diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 6163fb7a94769e2ea79c828663854bab982446f5..270d1211227b9e51322c2deb4a6d744d357480c4 100644 (file)
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -13,10 +13,10 @@ AUX module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425 RMD160 ce073
 MD5 54fcfc62bd715c9557b321dfb4654044 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
 RMD160 ce073d744e0eb191ef10f3a1186f393b42620813 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
 SHA256 5a058a5dfae5bd6eaf6fa338b800f477b542dd9da0c09283d274504beb19c3b6 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
-AUX modules-update 11312 RMD160 7af3ec6aa2e6e86db9327b934f7c395f5cc5310e SHA1 793a2dd061b0e31786879bd5eb3796f742ec3621 SHA256 6149e543955cbb97e42aaa3de027311ca41d483882239c6d7ec0373c097e80b2
-MD5 e3af3656ea89f3563e7633b5ddb2f2ec files/modules-update 11312
-RMD160 7af3ec6aa2e6e86db9327b934f7c395f5cc5310e files/modules-update 11312
-SHA256 6149e543955cbb97e42aaa3de027311ca41d483882239c6d7ec0373c097e80b2 files/modules-update 11312
+AUX modules-update 11387 RMD160 89f974c85038a7d10e30a4b6033642ec94ebdae3 SHA1 185796c9b3e36e8e0b8c665f6e4f9830859f54a1 SHA256 ea69606d33a9e5dfa525fe95d20d0564c22bda8816c17939179aa5dc7f9fe8d3
+MD5 871bf80d14efcbc82cdac7979318a81d files/modules-update 11387
+RMD160 89f974c85038a7d10e30a4b6033642ec94ebdae3 files/modules-update 11387
+SHA256 ea69606d33a9e5dfa525fe95d20d0564c22bda8816c17939179aa5dc7f9fe8d3 files/modules-update 11387
 AUX modutils-2.4.27-alias.patch 2246 RMD160 bcf4fffbecae76e5b14b05c9003ba4f0cf2675ff SHA1 7d69355210aaccbd2dc6dd8a9b1b736f74dfdd36 SHA256 453e3ab982088e2e85164e63b4944af58cd01c2b2d45d75fdcda6649a339878f
 MD5 5428d53f18b5fac287741b23634d84dc files/modutils-2.4.27-alias.patch 2246
 RMD160 bcf4fffbecae76e5b14b05c9003ba4f0cf2675ff files/modutils-2.4.27-alias.patch 2246
@@ -68,7 +68,7 @@ SHA256 a0137b244c6cab76e8a2cb31e651484992231b823af1d8d4fc2e1a5db10fe5f6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxRnF8bi6rjpTunYRAkHZAKDUiq1Gn2y1e+6ZUI9vcDH9K1xQ5wCgnMmG
-P8yeywxzLq+rX0vUHsDMfeU=
-=QbG4
+iD8DBQFFxnYp8bi6rjpTunYRApwLAKDGxZsOpulaE0rvWcBev3g8iOfmCACg2CKa
+Cr2TV+dbbS7xShgD7GBtlE4=
+=YD10
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/module-init-tools/files/modules-update b/sys-apps/module-init-tools/files/modules-update
index bd6b8ebccc6b568fb6b6017a95e9476c85542d2f..161a7f5bd1d754a6b482853cc1212b275324401c 100755 (executable)
--- a/sys-apps/module-init-tools/files/modules-update
+++ b/sys-apps/module-init-tools/files/modules-update
@@ -397,13 +397,16 @@ depfile=$(grab_depfile)
 
 if [[ -d ${depfile%/*} ]] ; then
        if [[ ${CFG_NEW_FILE} -nt ${depfile} ]] ; then
+               arch=$(uname -m)
                ebegin "Updating modules.dep"
-               for cfg in /lib/modules/${KV}/build /usr/src/linux-${KV} \
+               for cfg in /boot /lib/modules/${KV}/build /usr/src/linux-${KV} \
                           /boot /usr/src/linux ""
                do
                        cfg="${cfg}/System.map"
-                       for suffix in -genkernel-${KV} -${KV} "" ; do
-                               [[ -f ${cfg}${suffix} ]] && cfg="${cfg}${suffix}" && break 2
+                       for suffix in -genkernel-{${arch},'*'}-${KV} -${KV} "" ; do
+                               scfg=$(echo ${cfg}${suffix})
+                               scfg=${scfg%% *}
+                               [[ -f ${scfg} ]] && cfg=${scfg} && break 2
                        done
                done
                [[ -n ${cfg} ]] && cfg="-F ${cfg}"