From 1b3fff1df48e0b9377c88114b4b78a0792f957c8 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 24 Sep 2010 20:44:39 +0000 Subject: [PATCH] Moved scsi_tgt removal to a separate patch. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2262 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 61e9214ca..e64232cfc 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -547,6 +547,20 @@ add_file "scst_local/README" "Documentation/scst/README.scst_local" \ # Directory drivers/scsi/ibmvstgt +{ + ( cd ibmvstgt && ./generate-in-tree-patches "${kernel_version}" ) + if [ -e "ibmvstgt/in-tree-patches/${kernel_version}" ]; then + for f in \ + drivers/scsi/ibmvscsi/ibmvstgt.c \ + drivers/scsi/libsrp.c \ + include/scsi/libsrp.h + do + add_patch "ibmvstgt/in-tree-patches/${kernel_version}/$(basename $f).patch" $f + done + fi +} \ +| process_patch "ibmvstgt.diff" + { ( cd ibmvstgt && ./generate-in-tree-patches "${kernel_version}" ) if [ -e "ibmvstgt/in-tree-patches/${kernel_version}" ]; then @@ -585,8 +599,6 @@ add_file "scst_local/README" "Documentation/scst/README.scst_local" \ drivers/scsi/Kconfig \ drivers/scsi/Makefile \ drivers/scsi/hosts.c \ - drivers/scsi/ibmvscsi/ibmvstgt.c \ - drivers/scsi/libsrp.c \ drivers/scsi/scsi_sysfs.c \ drivers/scsi/scsi_tgt_if.c \ drivers/scsi/scsi_tgt_lib.c \ @@ -595,7 +607,6 @@ add_file "scst_local/README" "Documentation/scst/README.scst_local" \ drivers/scsi/scsi_transport_fc_internal.h \ drivers/scsi/scsi_transport_srp.c \ drivers/scsi/scsi_transport_srp_internal.h \ - include/scsi/libsrp.h \ include/scsi/scsi_host.h \ include/scsi/scsi_tgt.h \ include/scsi/scsi_tgt_if.h @@ -604,4 +615,4 @@ add_file "scst_local/README" "Documentation/scst/README.scst_local" \ done fi } \ -| process_patch "ibmvstgt.diff" +| process_patch "scsi_tgt.diff"