From f85822457ea4253633b381f33e62c49607d02eaa Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 11 Jun 2015 17:48:46 +0000 Subject: [PATCH] scripts/generate-kernel-patch: Merge more changes from the trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6304 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 6c443d974..e12272d55 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -282,6 +282,7 @@ for p in scst/kernel/*-${kver}.patch \ echo iscsi-scst/kernel/patches/*-${kver}.patch; fi) do + [ -e "$p" ] || continue # Exclude the put_page_callback patch when command-line option -u has been # specified since the current approach is not considered acceptable for # upstream kernel inclusion. See also http://lkml.org/lkml/2008/12/11/213. @@ -457,9 +458,16 @@ make -s -C iscsi-scst include/iscsi_scst_itf_ver.h ( for f in $(ls iscsi-scst/include/*h 2>/dev/null) do - if [ "${f}" != "iscsi-scst/include/iscsi_scst_itf_ver.h" ]; then - add_file "${f}" "include/scst/${f#iscsi-scst/include/}" - fi + case "${f}" in + "iscsi-scst/include/iscsi_scst_itf_ver.h") + ;; + "iscsi-scst/include/iscsit_transport.h") + add_file "${f}" "drivers/scst/iscsi-scst/${f#iscsi-scst/include/}" + ;; + *) + add_file "${f}" "include/scst/${f#iscsi-scst/include/}" + ;; + esac done add_file "iscsi-scst/include/iscsi_scst_itf_ver.h" "include/scst/iscsi_scst_itf_ver.h" @@ -473,6 +481,11 @@ for f in $(ls iscsi-scst/kernel/*.[ch] 2>/dev/null) do add_file "${f}" "drivers/scst/iscsi-scst/${f#iscsi-scst/kernel/}" done + +for f in $(ls iscsi-scst/kernel/isert-scst/*.[ch] 2>/dev/null) +do + add_file "${f}" "drivers/scst/iscsi-scst/${f#iscsi-scst/kernel/isert-scst/}" +done ) \ | process_patch "iscsi-scst.diff"