mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/generate-kernel-patch: Merge more changes from the trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6304 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-11 17:48:46 +00:00
parent 995730ddd7
commit f85822457e
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/generate-kernel-patch
View File

@@ -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"