Kurt Garloff wrote:
>
> On Thu, Jun 22, 2000 at 09:42:16PM -0400, Doug Gilbert wrote:
> > prior to 2.4.0-test2-pre? now
> > ---------------------------------------
> > scsi_mod.o scsi_mod.o
> > sd_mod.o sd.o
> > sr_mod.o sr_mod.o
> > st.o st.o
> > sg.o sg.o
>
> This is indeed strange.
> I can only agree with Doug: Either change all of them to the more logical
> names w/o _mod, or leave them all alone.
The sd_mod.o module changed name to sd.o in lk 2.4.0-test2 .
As of the latest test kernel lk 2.4.0-test4-pre5 it hasn't
changed back. An impressive cleanup has been done on the
drivers/scsi/Makefile (formerly 767 lines down to 195 lines).
My guess is that the module name change was an oversight. To
date I haven't received a response from the author of the
Makefile cleanup. So attached is my patch to return the
module name to what it formerly was. I have built a kernel
with modules based on the modified Makefile but it is
inconvenient for me to run it. Would someone like to test
this patched Makefile?
Doug Gilbert
--- linux/drivers/scsi/Makefile Sun Jul 9 16:34:55 2000
+++ linux/drivers/scsi/Makefile.t2n Mon Jul 10 22:56:27 2000
@@ -31,7 +31,7 @@
obj-$(CONFIG_SCSI) += scsi_mod.o
obj-$(CONFIG_CHR_DEV_ST) += st.o
-obj-$(CONFIG_BLK_DEV_SD) += sd.o
+obj-$(CONFIG_BLK_DEV_SD) += sd_mod.o
obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o
obj-$(CONFIG_CHR_DEV_SG) += sg.o
@@ -152,6 +152,9 @@
scsi_mod.o: $(scsi_mod-objs)
$(LD) -r -o $@ $(scsi_mod-objs)
+
+sd_mod.o: sd.o
+ $(LD) -r -o $@ sd.o
sr_mod.o: $(sr_mod-objs)
$(LD) -r -o $@ $(sr_mod-objs)
