mirror of
https://github.com/SCST-project/scst.git
synced 2026-08-17 12:46:27 +00:00
svn merge -r2369:2520 https://scst.svn.sourceforge.net/svnroot/scst/branches/ibmvstgt-port/scripts
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2521 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -136,9 +136,13 @@ function process_patch {
|
||||
) >"${tmppatch}"
|
||||
touch "${tmppatch}"
|
||||
{
|
||||
awk 'BEGIN{h=1}/^diff/{h=0}/^---/{h=0}h!=0{print}' < "${tmppatch}";
|
||||
echo "---"; diffstat "${tmppatch}"; echo "";
|
||||
awk 'BEGIN{h=1}/^diff/{h=0}/^---/{h=0}h==0{print}' < "${tmppatch}";
|
||||
if [ -e /usr/bin/diffstat ]; then
|
||||
awk 'BEGIN{h=1}/^diff/{h=0}/^---/{h=0}h!=0{print}' < "${tmppatch}"
|
||||
echo "---"
|
||||
diffstat "${tmppatch}"
|
||||
echo ""
|
||||
awk 'BEGIN{h=1}/^diff/{h=0}/^---/{h=0}h==0{print}' < "${tmppatch}"
|
||||
fi
|
||||
} \
|
||||
> "${patchdir}/$(basename $1)"
|
||||
rm -f "${tmppatch}"
|
||||
@@ -578,7 +582,8 @@ EOF
|
||||
for f in \
|
||||
drivers/scsi/ibmvscsi/ibmvstgt.c \
|
||||
drivers/scsi/libsrp.c \
|
||||
include/scsi/libsrp.h
|
||||
include/scsi/libsrp.h \
|
||||
include/scsi/srp.h
|
||||
do
|
||||
add_patch "ibmvstgt/in-tree-patches/${kernel_version}/$(basename $f).patch" $f
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user