Description of problem:
If the kernel for which mkinitrd is being performed has ".o" 
(or ".ko") in its name (for example, "2.4.22.nptl.openswan.1.0.3"), 
mkinitrd fails to include the correct modules in the initrd image.

This because mkinitrd in the function moduledep issues the 
command "match(filename, /\/([^\/]+)\.k?o/, ret)". The regular 
expression should match the name of the module in strigs found in the 
modules.dep file, for ex.:
/lib/modules/2.4.22-1.2174.nptl/kernel/fs/ext3/ext3.o:
/lib/modules/2.4.22-1.2174.nptl/kernel/fs/jbd/jbd.o

The ".k?o" in the regexp should match the ".o" or ".ko" in the module 
file name: but if the kernel name contains ".o" or ".ko" in its name 
the match, which is done leftmost, fails to catch the module name.
In my case, I need ext3.o in my initrd which depends on jbd.o. If and 
only if my kernel name has ".o" (or ".ko") in it, jbd.o is not 
included in the initrd.

Patch to fix the problem:

--- mkinitrd.orig       2004-08-07 18:05:45.000000000 +0200
+++ mkinitrd    2004-08-07 18:06:17.000000000 +0200
@@ -65,7 +65,7 @@
 
     [ -n "$verbose" ] && echo -n "Looking for deps of module $1"
     deps=$(awk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \
-                function modname(filename) { match(filename, /\/
([^\/]+)\.k?o/, ret); return ret[1] } \
+                function modname(filename) { match(filename, /\/
([^\/]+)\.k?o:?$/, ret); return ret[1] } \
                 function show() { if (orig == searched) { print dep; 
orig=""; rc=0; exit } } \
                 /^\/lib/ { show(); \
                            orig=modname($1); \

Version-Release number of selected component (if applicable):
mkinitrd-3.5.14-1

How reproducible:
always

Steps to Reproduce:
1. Build a kernel with .o in its name on a system where initrd is 
needed, with a module to be included in it that depends on another 
module
2. mkinitrd . Notice that the needed module is not included
3. 
  
Actual results:


Expected results:


Additional info: