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

Merged revisions 5822-5826,5828,5830 via svnmerge from

Browse Source 
svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/branches/3.0.x

........
  r5822 | bvassche | 2014-10-03 13:51:13 +0200 (Fri, 03 Oct 2014) | 1 line
  
  scripts/rebuild-rhel-kernel-rpm: Enable put_page_callback patch for RHEL 7 (merge r5817 from trunk)
........
  r5823 | bvassche | 2014-10-03 13:59:39 +0200 (Fri, 03 Oct 2014) | 1 line
  
  scripts: Merge r5533:5821 from trunk except rebuild-rhel-kernel-rpm
........
  r5824 | bvassche | 2014-10-03 14:07:17 +0200 (Fri, 03 Oct 2014) | 2 lines
  
  scripts/rebuild-rhel-kernel-rpm: Move code for downloading a RHEL (clone) RPM into a separate file (merge r5672 from trunk)
........
  r5825 | bvassche | 2014-10-03 14:08:24 +0200 (Fri, 03 Oct 2014) | 1 line
  
  scripts/rebuild-rhel-kernel-rpm: Add RHEL 7 support (merge r5712 from trunk)
........
  r5826 | bvassche | 2014-10-03 14:10:28 +0200 (Fri, 03 Oct 2014) | 1 line
  
  scripts/rebuild-rhel-kernel-rpm: Fix for invocation from current directory (merge r5744 from trunk)
........
  r5828 | bvassche | 2014-10-03 14:24:27 +0200 (Fri, 03 Oct 2014) | 1 line
  
  scripts/generate-kernel-patch: Only generate scst_itf_ver.h if needed (merge r5827 from trunk)
........
  r5830 | bvassche | 2014-10-03 14:27:30 +0200 (Fri, 03 Oct 2014) | 2 lines
  
  scst_mem: Fix a memory leak triggered by the scst_user driver (merge r5829 from trunk)
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x-iser@5831 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Yan Burman
2014-10-05 06:10:20 +00:00
parent bf7cb97bc7
commit 457dfaaf3e
5 changed files with 254 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/run-regression-tests
+25 -21
View File
@@ -263,30 +263,32 @@ CONFIG_TRACING CONFIG_X86_32 \
"
echo "Patching and configuring kernel ..."
if [ "$ipv6" = "false" ]; then
disable="$disable CONFIG_IPV6"
fi
(
local srcdir="$PWD"
cd "${outputdir}/linux-$1" \
&& if [ "${multiple_patches}" = "false" ]; then
patch -p1 -f -s <"${patchfile}" >"${patchoutput}"
else
rm -f "${patchoutput}"
for p in "${outputdir}/${patchdir}"/*
do
echo "==== $p" >>"${patchoutput}"
patch -p1 -f -s <"${p}" >>"${patchoutput}" 2>&1
done
fi \
&& if [ -e $srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch ]; then
echo "$srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch ..." \
cd "${outputdir}/linux-$1" &&
if [ "${multiple_patches}" = "false" ]; then
patch -p1 -f -s <"${patchfile}" >"${patchoutput}"
else
rm -f "${patchoutput}"
for p in "${outputdir}/${patchdir}"/*; do
echo "==== $p" >>"${patchoutput}"
patch -p1 -f -s <"${p}" >>"${patchoutput}" 2>&1
done
fi &&
if [ -e $srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch ]; then
echo "$srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch ..." \
>>"${patchoutput}"
patch -p1 -f -s <$srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch \
>>"${patchoutput}";
else
echo "srpt/patches/kernel-${kver}-pre-cflags.patch not found."; \
fi \
&& make -s allmodconfig &>"${outputdir}/make-config-output.txt" \
&& for c in $disable; do sed -i.tmp "s/^$c=y\$/$c=n/" .config; done \
&& make -s oldconfig &>/dev/null
patch -p1 -f -s <$srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch \
>>"${patchoutput}"
else
echo "srpt/patches/kernel-${kver}-pre-cflags.patch not found."
fi &&
make -s allmodconfig &>"${outputdir}/make-config-output.txt" &&
for c in $disable; do sed -i.tmp "s/^$c=[ym]\$/$c=n/" .config; done &&
make -s oldconfig &>/dev/null
)
}
@@ -585,6 +587,7 @@ do
run_checkpatch="true"
run_sparse="true"
run_smatch="true"
ipv6="true"
global_multiple_patches="${multiple_patches}"
while [ "${kv%-?}" != "${kv}" -o "${kv%-??}" != "${kv}" ]; do
kv_without_opt="${kv%-?}"
@@ -593,6 +596,7 @@ do
fi
kopt="${kv#${kv_without_opt}}"
case "${kopt}" in
'-4') ipv6="false";;
'-f') full_check="true";;
'-i') ibmvio="true";;
'-nc') run_checkpatch="false";;