[Scst-svn] SF.net SVN: scst: [106] trunk

[<vl...@us...>]

Revision: 106
          http://svn.sourceforge.net/scst/?rev=106&view=rev
Author:   vlnb
Date:     2007-04-03 07:49:33 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Fixed depmod to work for the necessary kernel, not the current one

Modified Paths:
--------------
    trunk/qla2x00t/Makefile
    trunk/qla2x00t/qla2x00-target/Makefile
    trunk/scst/src/Makefile
    trunk/scst/src/dev_handlers/Makefile

Modified: trunk/qla2x00t/Makefile
===================================================================
--- trunk/qla2x00t/Makefile	2007-04-03 14:47:47 UTC (rev 105)
+++ trunk/qla2x00t/Makefile	2007-04-03 14:49:33 UTC (rev 106)
@@ -21,7 +21,8 @@
 else
 ifeq ($(KVER),)
   ifeq ($(KDIR),)
-    KDIR := /lib/modules/$(shell uname -r)/build
+    KVER = $(shell uname -r)
+    KDIR := /lib/modules/$(KVER)/build
   endif
 else
   KDIR := /lib/modules/$(KVER)/build
@@ -36,7 +37,7 @@
 
 uninstall:
 	rm -f $(INSTALL_DIR)/qla2[2-3]00.ko $(INSTALL_DIR)/qla2xxx.ko 
-	-/sbin/depmod -a
+	-/sbin/depmod -a $(KVER)
 endif
 
 clean:

Modified: trunk/qla2x00t/qla2x00-target/Makefile
===================================================================
--- trunk/qla2x00t/qla2x00-target/Makefile	2007-04-03 14:47:47 UTC (rev 105)
+++ trunk/qla2x00t/qla2x00-target/Makefile	2007-04-03 14:49:33 UTC (rev 106)
@@ -42,7 +42,8 @@
 
 ifeq ($(KVER),)
   ifeq ($(KDIR),)
-    KDIR := /lib/modules/$(shell uname -r)/build
+    KVER = $(shell uname -r)
+    KDIR := /lib/modules/$(KVER)/build
   endif
 else
   KDIR := /lib/modules/$(KVER)/build
@@ -66,7 +67,7 @@
 install: all
 	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
 		modules_install
-	-depmod -a
+	-depmod -a $(KVER)
 
 SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)
 ifneq ($(SCST_MOD_VERS),)
@@ -87,7 +88,7 @@
 
 uninstall:
 	rm -f $(INSTALL_DIR)/qla2[23x]00tgt.ko
-	-/sbin/depmod -a
+	-/sbin/depmod -a $(KVER)
 endif
 
 clean:

Modified: trunk/scst/src/Makefile
===================================================================
--- trunk/scst/src/Makefile	2007-04-03 14:47:47 UTC (rev 105)
+++ trunk/scst/src/Makefile	2007-04-03 14:49:33 UTC (rev 106)
@@ -47,7 +47,8 @@
 else
 ifeq ($(KVER),)
   ifeq ($(KDIR),)
-    KDIR := /lib/modules/$(shell uname -r)/build
+    KVER = $(shell uname -r)
+    KDIR := /lib/modules/$(KVER)/build
   endif
 else
   KDIR := /lib/modules/$(KVER)/build
@@ -77,13 +78,13 @@
 	rm -f $(INSTALL_DIR_H)/Modules.symvers
 	install -m 644 Module.symvers $(INSTALL_DIR_H)
 endif
-	-depmod -a
+	-depmod -a $(KVER)
 
 uninstall:
 	cd $(DEV_HANDLERS_DIR) && $(MAKE) $@
 	rm -f $(INSTALL_DIR)/scsi_tgt.ko
 	-rmdir $(INSTALL_DIR) 2>/dev/null
-	-/sbin/depmod -a
+	-/sbin/depmod -a $(KVER)
 	rm -rf $(INSTALL_DIR_H)
 endif
 

Modified: trunk/scst/src/dev_handlers/Makefile
===================================================================
--- trunk/scst/src/dev_handlers/Makefile	2007-04-03 14:47:47 UTC (rev 105)
+++ trunk/scst/src/dev_handlers/Makefile	2007-04-03 14:49:33 UTC (rev 106)
@@ -43,7 +43,8 @@
 
 else
 ifeq ($(KDIR),)
-  KDIR := /lib/modules/$(shell uname -r)/build
+  KVER = $(shell uname -r)
+  KDIR := /lib/modules/$(KVER)/build
 endif
 
 all:
@@ -52,7 +53,7 @@
 install: all
 	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) \
 		modules_install
-	-depmod -a
+	-depmod -a $(KVER)
 
 uninstall:
 	rm -f $(INSTALL_DIR)/scst_*.ko


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.