From a1308234a4ec3f2f435a0720701aedea88d2aee5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 1 May 2019 04:00:47 +0000 Subject: [PATCH] scripts/generate-kernel-patch: Restore the qla2xxx code git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@8283 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 2a6be948c..975ae2a61 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -494,7 +494,7 @@ add_file "iscsi-scst/README_in-tree" "Documentation/scst/README.iscsi" \ | process_patch "iscsi-scst-doc.diff" -# Directory drivers/scsi/qla2xxx/ +# Directory drivers/scst/qla2x00-target/ if [ "${qla2x00t}" = "true" ]; then @@ -515,9 +515,21 @@ if [ "${qla2x00t}" = "true" ]; then add_file "qla2x00t/qla2x_tgt_def.h" \ "drivers/scsi/qla2xxx/qla2x_tgt_def.h" + if [ -e "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" ] + then + add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \ + "drivers/scst/qla2xxx-target/Makefile" + else + add_file "qla2x00t/qla2x00-target/Makefile_in-tree" \ + "drivers/scst/qla2xxx-target/Makefile" + fi + + add_file "qla2x00t/qla2x00-target/Kconfig" \ + "drivers/scst/qla2xxx-target/Kconfig" + for f in qla2x00t/qla2x00-target/*.[ch]; do - [ -e "$f" ] && - add_file "${f}" "drivers/scsi/qla2xxx/${f#qla2x00t/qla2x00-target/}" + [ -e "$f" ] || continue + add_file "${f}" "drivers/scst/qla2xxx-target/${f#qla2x00t/qla2x00-target/}" done add_file "qla2x00t/qla2x00-target/README" \