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

Whether or not SCSI_EXEC_REQ_FIFO_DEFINED and SCST_IO_CONTEXT are defined

Browse Source 
does now depend on their definition in the per kernel-version patches.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1053 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2009-08-14 19:34:55 +00:00
parent befe0a36fa
commit 8c029b22ec
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/generate-kernel-patch
View File

@@ -101,14 +101,20 @@ function process_patch {
(
echo "Signed-off-by: ${SIGNED_OFF_BY}"
echo ""
"$(dirname $0)/specialize-patch" -v kernel_version="${kernel_version}"
"$(dirname $0)/specialize-patch" \
-v kernel_version="${kernel_version}" \
-v SCSI_EXEC_REQ_FIFO_DEFINED="${scsi_exec_req_fifo_defined}" \
-v SCST_IO_CONTEXT="${scst_io_context}"
) >"${patchdir}/$1"
else
# echo "Discarded $(wc -l) lines."
true
fi
else
"$(dirname $0)/specialize-patch" -v kernel_version="${kernel_version}"
"$(dirname $0)/specialize-patch" \
-v kernel_version="${kernel_version}" \
-v SCSI_EXEC_REQ_FIFO_DEFINED="${scsi_exec_req_fifo_defined}" \
-v SCST_IO_CONTEXT="${scst_io_context}"
fi
}
@@ -182,9 +188,17 @@ fi
# General kernel patches.
scsi_exec_req_fifo_defined=0
scst_io_context=0
for p in scst/kernel/*-${kernel_version}.patch \
iscsi-scst/kernel/patches/*-${kernel_version}.patch
do
if grep -q '^\+#define SCSI_EXEC_REQ_FIFO_DEFINED$' "${p}"; then
scsi_exec_req_fifo_defined=1
fi
if grep -q '^\+#define SCST_IO_CONTEXT$' "${p}"; then
scst_io_context=1
fi
diffname="${p#scst/kernel/}"
diffname="${p%-${kernel_version}.patch}.diff"
process_patch < "$p" "${diffname}"

16
scripts/specialize-patch
View File

@@ -91,11 +91,19 @@ function evaluate(stmnt) {
gsub("RHEL_RELEASE_CODE", RHEL_MAJOR * 256 + RHEL_MINOR, stmnt)
}
gsub("defined *SCSI_EXEC_REQ_FIFO_DEFINED", "1", stmnt)
gsub("defined *\\( *SCSI_EXEC_REQ_FIFO_DEFINED *\\)", "1", stmnt)
if (SCSI_EXEC_REQ_FIFO_DEFINED != "")
{
gsub("defined *SCSI_EXEC_REQ_FIFO_DEFINED",
SCSI_EXEC_REQ_FIFO_DEFINED, stmnt)
gsub("defined *\\( *SCSI_EXEC_REQ_FIFO_DEFINED *\\)",
SCSI_EXEC_REQ_FIFO_DEFINED, stmnt)
}
gsub("defined *SCST_IO_CONTEXT", "1", stmnt)
gsub("defined *\\( *SCST_IO_CONTEXT *\\)", "1", stmnt)
if (SCST_IO_CONTEXT != "")
{
gsub("defined *SCST_IO_CONTEXT", SCST_IO_CONTEXT, stmnt)
gsub("defined *\\( *SCST_IO_CONTEXT *\\)", SCST_IO_CONTEXT, stmnt)
}
do
{