kernel module installation: Skip "depmod" when building an RPM

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5612 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-06-19 12:48:25 +00:00
parent 1fdd3d9a8d
commit e902f79ecf
11 changed files with 15 additions and 2 deletions

View File

@@ -86,6 +86,7 @@ tgt: Modules.symvers Module.symvers
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
SCST_INC_DIR=$(SCST_INC_DIR) modules_install
ins:

View File

@@ -38,7 +38,9 @@ all: src/$(MODULE_SYMVERS)
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src modules
install: all src/ibmvstgt.ko
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src modules_install
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
uninstall:
rm -f $(INSTALL_DIR)/libsrp.ko $(INSTALL_DIR)/ibmvstgt.ko

View File

@@ -70,6 +70,7 @@ install: all
@install -vD -m 755 usr/iscsi-scst-adm $(DESTDIR)$(SBINDIR)/iscsi-scst-adm
@install -vD -m 644 doc/manpages/iscsi-scst-adm.8 $(DESTDIR)$(MANDIR)/man8/iscsi-scst-adm.8
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
uninstall:

View File

@@ -74,6 +74,7 @@ tgt: Modules.symvers Module.symvers
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)

View File

@@ -89,6 +89,7 @@ tgt: Modules.symvers Module.symvers
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
ins:

View File

@@ -61,6 +61,7 @@ all:
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
uninstall:

View File

@@ -105,6 +105,7 @@ ifneq ($(BUILD_2X_MODULE),)
SCST_INC_DIR=$(SCST_INC_DIR)
endif
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
SCST_INC_DIR=$(SCST_INC_DIR) modules_install
uninstall:

View File

@@ -52,7 +52,9 @@ extraclean: clean
rm -f *.orig *.rej
install:
@$(MAKE) -C ${LINUX} M=${CURDIR}/build modules_install
@$(MAKE) -C ${LINUX} M=${CURDIR}/build \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
install_host_progs:
@$(MAKE) -C build $@

View File

@@ -73,6 +73,7 @@ all:
install: all
mkdir -p $(DESTDIR)/var/lib/scst/vdev_mode_pages
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
uninstall:

View File

@@ -61,6 +61,7 @@ all: Modules.symvers Module.symvers
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
SCST_INC_DIR=$(SCST_INC_DIR) modules_install
SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)

View File

@@ -94,6 +94,7 @@ all: src/$(MODULE_SYMVERS)
install: all src/ib_srpt.ko
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \
PRE_CFLAGS="$(OFED_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
uninstall: