From eb03ee602b50f92ac493f9e0111cb2476fb17ef3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 29 Sep 2019 22:09:05 +0000 Subject: [PATCH 1/2] iscsi-scst/Makefile: Fix a syntax error that was introduced in r8593 Reported-by: Rob Turk git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8594 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index 343ac6cbe..b363f803d 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -155,7 +155,7 @@ install: all modules_install echo "$@: INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)" if $(INFINIBAND_ENABLED); then \ - (cd $(ISERTMOD) && KDIR=$(KDIR) ../../../scripts/sign-modules) + (cd $(ISERTMOD) && KDIR=$(KDIR) ../../../scripts/sign-modules);\ $(MAKE) -C $(KDIR) M=$(ISERTMOD) \ $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \ modules_install; \ From 06ee7ca41d34165681df7f18979b534c05f5d860 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 29 Sep 2019 22:10:46 +0000 Subject: [PATCH 2/2] Makefile: Unbreak the RPM build process git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8595 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 14dca74b9..7a2dd4893 100644 --- a/Makefile +++ b/Makefile @@ -432,7 +432,7 @@ make-scst-dist = \ rm -rf "$${name}-$(3)" scst-dist-gzip: - $(call make-scst-dist,j,bz2,$(VERSION),grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/|^scstadmin/') + $(call make-scst-dist,j,bz2,$(VERSION),grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scripts/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/|^scstadmin/') scst-rpm: name=scst && \