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

Merged /trunk/scripts:r4356-4405

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4428 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-07-27 16:30:27 +00:00
parent 2f527c350c
commit 5caf5bdd99
2 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/run-regression-tests
View File

@@ -169,11 +169,11 @@ function generate_kernel_patch {
$([ "${mpt_scst}" = "true" ] && echo "-m") \
$([ "${qla2x00t}" = "true" ] && echo "-q")"
scripts/generate-kernel-patch ${driver_options} $2 $1 > "${patchfile}"
"${scriptsdir}"/generate-kernel-patch ${driver_options} $2 $1 > "${patchfile}"
scripts/generate-kernel-patch ${driver_options} -n $2 $1 > "${patchfile_m}"
"${scriptsdir}"/generate-kernel-patch ${driver_options} -n $2 $1 > "${patchfile_m}"
scripts/generate-kernel-patch ${driver_options} -p "${outputdir}/${patchdir}" $2 $1
"${scriptsdir}"/generate-kernel-patch ${driver_options} -p "${outputdir}/${patchdir}" $2 $1
}
# Run checkpatch on the generated kernel patch. Assumes that there is a
@@ -215,6 +215,40 @@ function patch_and_configure_kernel {
local kver="$(kernel_version $1)"
local patchfile="${outputdir}/scst-$1-kernel-matching-line-numbers.patch"
local patchoutput="${outputdir}/patch-command-output-$1.txt"
local disable=" \
CONFIG_BINARY_PRINTF \
CONFIG_BLK_DEV_IO_TRACE \
CONFIG_BRANCH_PROFILE_NONE \
CONFIG_CONTEXT_SWITCH_TRACER \
CONFIG_DEBUG_STRICT_USER_COPY_CHECKS \
CONFIG_DYNAMIC_FTRACE \
CONFIG_EVENT_TRACE_TEST_SYSCALLS \
CONFIG_EVENT_TRACING \
CONFIG_FTRACE \
CONFIG_FTRACE_MCOUNT_RECORD \
CONFIG_FTRACE_NMI_ENTER \
CONFIG_FTRACE_SELFTEST \
CONFIG_FTRACE_STARTUP_TEST \
CONFIG_FTRACE_SYSCALLS \
CONFIG_FUNCTION_GRAPH_TRACER \
CONFIG_FUNCTION_PROFILER \
CONFIG_FUNCTION_TRACER \
CONFIG_GENERIC_TRACER \
CONFIG_HAVE_FTRACE_NMI_ENTER \
CONFIG_IRQSOFF_TRACER \
CONFIG_IWLWIFI_DEVICE_TRACING \
CONFIG_IWM_TRACING \
CONFIG_KVM_MMU_AUDIT \
CONFIG_MAC80211_DRIVER_API_TRACER \
CONFIG_MMIOTRACE \
CONFIG_NET_DROP_MONITOR \
CONFIG_NOP_TRACER \
CONFIG_SCHED_TRACER \
CONFIG_STACK_TRACER \
CONFIG_TRACEPOINTS \
CONFIG_TRACER_MAX_TRACE \
CONFIG_TRACING CONFIG_X86_32 \
"
echo "Patching and configuring kernel ..."
(
@@ -239,8 +273,7 @@ function patch_and_configure_kernel {
echo "srpt/patches/kernel-${kver}-pre-cflags.patch not found."; \
fi \
&& make -s allmodconfig &>"${outputdir}/make-config-output.txt" \
&& sed -i.tmp 's/^CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y$/CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=n/' .config \
&& for c in CONFIG_BINARY_PRINTF CONFIG_BLK_DEV_IO_TRACE CONFIG_BRANCH_PROFILE_NONE CONFIG_CONTEXT_SWITCH_TRACER CONFIG_DYNAMIC_FTRACE CONFIG_EVENT_TRACE_TEST_SYSCALLS CONFIG_EVENT_TRACING CONFIG_FTRACE CONFIG_FTRACE_MCOUNT_RECORD CONFIG_FTRACE_NMI_ENTER CONFIG_FTRACE_SELFTEST CONFIG_FTRACE_STARTUP_TEST CONFIG_FTRACE_SYSCALLS CONFIG_FUNCTION_GRAPH_TRACER CONFIG_FUNCTION_PROFILER CONFIG_FUNCTION_TRACER CONFIG_GENERIC_TRACER CONFIG_HAVE_FTRACE_NMI_ENTER CONFIG_IRQSOFF_TRACER CONFIG_IWLWIFI_DEVICE_TRACING CONFIG_IWM_TRACING CONFIG_KVM_MMU_AUDIT CONFIG_MAC80211_DRIVER_API_TRACER CONFIG_MMIOTRACE CONFIG_NET_DROP_MONITOR CONFIG_NOP_TRACER CONFIG_SCHED_TRACER CONFIG_STACK_TRACER CONFIG_TRACEPOINTS CONFIG_TRACER_MAX_TRACE CONFIG_TRACING; do sed -i.tmp "s/^$c=y\$/$c=n/" .config; done \
&& for c in $disable; do sed -i.tmp "s/^$c=y\$/$c=n/" .config; done \
&& make -s oldconfig &>/dev/null
)
}
@@ -404,6 +437,7 @@ if [ ! -e scst -o ! -e iscsi-scst -o ! -e srpt ]; then
exit 1
fi
scriptsdir="$(dirname $0)"
# Where to store persistenly downloaded kernel tarballs and kernel patches.
kernel_sources="$HOME/software/downloads"
# URL for downloading kernel tarballs and kernel patches.

6
scripts/specialize-patch
View File

@@ -503,11 +503,11 @@ BEGIN {
while (match($0, "\\\\$"))
{
previous_line = $0
sub("\\\\$", "", previous_line)
sub("[ \t]*\\\\$", "", previous_line)
getline
input_line[input_line_count++] = $0
sub("^+", "", $0)
$0 = previous_line $0
sub("^+[ \t]*", "", $0)
$0 = previous_line " " $0
}
discard = 0