various other foo.o -> foo.ko conversions

7 files changed, 11 insertions, 11 deletions

diff --git a/loader2/hardware.c b/loader2/hardware.c
index 4eddd828d..e3fce9273 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -174,7 +174,7 @@ int scsiTapeInitialize(moduleList modLoaded, moduleDeps modDeps,
         return 0;
     }
 
-    logMessage("scsi tape device(s) found, loading st.o");
+    logMessage("scsi tape device(s) found, loading st.ko");
 
     if (mlLoadModuleSetLocation("st", modLoaded, modDeps, 
 				modInfo, flags, 
diff --git a/loader2/loader.c b/loader2/loader.c
index 89c7fa895..f1b75012c 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1286,7 +1286,7 @@ int main(int argc, char ** argv) {
      * describing which scsi disks go with which scsi adapters */
     writeScsiDisks(modLoaded);
 
-    /* if we are in rescue mode lets load st.o for tape support */
+    /* if we are in rescue mode lets load st.ko for tape support */
     if (FL_RESCUE(flags))
 	scsiTapeInitialize(modLoaded, modDeps, modInfo, flags);
 
diff --git a/loader2/modstubs.c b/loader2/modstubs.c
index e4ce3c2a9..dcd965323 100644
--- a/loader2/modstubs.c
+++ b/loader2/modstubs.c
@@ -37,7 +37,7 @@ extern long init_module(void *, unsigned long, const char *);
 extern long delete_module(const char *, unsigned int);
 
 static int usage() {
-    fprintf(stderr, "usage: insmod [-p <path>] <module>.o\n");
+    fprintf(stderr, "usage: insmod [-p <path>] <module>.ko\n");
     return 1;
 }
 
diff --git a/loader2/module-info b/loader2/module-info
index cd27c77e1..3ec01ed94 100644
--- a/loader2/module-info
+++ b/loader2/module-info
@@ -9,7 +9,7 @@ Version 0
 #  Comments start in the first column, or are preceded only by whitespace.
 #  The []'s above are not literal, they delimit optional material.
 #  There can be multiple <argument> lines.
-#  <module-name> is the name of the module without any .o extension, just
+#  <module-name> is the name of the module without any .ko extension, just
 #  as the module name would be entered in /etc/modules.conf
 #  <module-type> is the base part of the string demanded by kerneld (eth,
 #  scsi_hostadapter, etc.)
diff --git a/loader2/modules.c b/loader2/modules.c
index 74637bb15..158ee6a9a 100644
--- a/loader2/modules.c
+++ b/loader2/modules.c
@@ -276,7 +276,7 @@ static int loadModule(const char * modName, struct extractedModule * path,
         }
     }
 
-    sprintf(fileName, "%s.o", modName);
+    sprintf(fileName, "%s.ko", modName);
     for (argPtr = args; argPtr && *argPtr; argPtr++) {
         strcat(fileName, " ");
         strcat(fileName, *argPtr);
diff --git a/packages.py b/packages.py
index 433410358..5bae58327 100644
--- a/packages.py
+++ b/packages.py
@@ -1316,10 +1316,10 @@ def copyExtraModules(instPath, grpset, extraModules):
                 pkg = "kernel-%s" %(tag,)
             arch = grpset.hdrlist[pkg][rpm.RPMTAG_ARCH]
             # version 1 path
-            pattern = pattern + " %s/%s/%s.o " % (n, arch, name)
+            pattern = pattern + " %s/%s/%s.ko " % (n, arch, name)
             # version 0 path
-            pattern = pattern + " %s/%s.o " % (n, name)
-            names = names + " %s.o" % (name,)
+            pattern = pattern + " %s/%s.ko " % (n, name)
+            names = names + " %s.ko" % (name,)
 	command = ("cd %s/lib/modules; gunzip < %s | "
                    "%s/bin/cpio --quiet -iumd %s" % 
                    (instPath, path, instPath, pattern))
@@ -1334,7 +1334,7 @@ def copyExtraModules(instPath, grpset, extraModules):
             
 	    toDir = "%s/lib/modules/%s/updates" % \
 		    (instPath, n)
-	    to = "%s/%s.o" % (toDir, name)
+	    to = "%s/%s.ko" % (toDir, name)
 
             if (os.path.isdir("%s/lib/modules/%s" %(instPath, n)) and not
                 os.path.isdir("%s/lib/modules/%s/updates" %(instPath, n))):
@@ -1343,7 +1343,7 @@ def copyExtraModules(instPath, grpset, extraModules):
                 continue
 
             arch = grpset.hdrlist[pkg][rpm.RPMTAG_ARCH]
-            for p in ("%s/%s.o" %(arch, name), "%s.o" %(name,)):
+            for p in ("%s/%s.ko" %(arch, name), "%s.ko" %(name,)):
                 fromFile = "%s/lib/modules/%s/%s" % (instPath, n, p)
 
                 if (os.access(fromFile, os.R_OK)):
diff --git a/scripts/mk-dd b/scripts/mk-dd
index ceeb9d1ce..e4989924a 100755
--- a/scripts/mk-dd
+++ b/scripts/mk-dd
@@ -58,7 +58,7 @@ rm -rf /tmp/modules
 mkdir /tmp/modules
 
 name=$(echo $srcname | sed 's/\.c$//')
-obj=${name}.o
+obj=${name}.ko
 
 klist="UP- SMP-smp ENTERPRISE-enterprise BOOT-BOOT"