mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 10:41:26 +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

37
scripts/generate-kernel-patch
View File

@@ -373,18 +373,33 @@ rm -rf "${tmpdir}"
for s in ${separate_patches}
do
fileset=$s
for f in $(set | grep "^$s=" | sed -e "s/^$s='\(.*\)'\$/\1/" -e "s/^$s=\(.*\)\$/\1/")
do
if [ "${f#scst/include}" != "${f}" ]; then
add_file "${f}" "include/scst/${f#scst/include/}"
elif [ "${f#doc}" != "${f}" ]; then
add_file "${f}" "Documentation/scst/${f#doc/}"
else
add_file "${f}" "drivers/scst/${f#scst/src/}"
{
fileset=$s
for f in $(set | grep "^$s=" | sed -e "s/^$s='\(.*\)'\$/\1/" -e "s/^$s=\(.*\)\$/\1/")
do
if [ "${f#scst/include}" != "${f}" ]; then
add_file "${f}" "include/scst/${f#scst/include/}"
elif [ "${f#doc}" != "${f}" ]; then
add_file "${f}" "Documentation/scst/${f#doc/}"
else
add_file "${f}" "drivers/scst/${f#scst/src/}"
fi
done
if grep -q /scst_itf_ver.h scst/src/Makefile &&
[ "$s" = "scst_03_public_headers" ]; then
tmp_itf_ver="$(mktemp /tmp/scst-itf-ver.h.XXXXXXXXXX)"
cat <<"EOF" >$tmp_itf_ver
/* Autogenerated, don't edit */
#define SCST_INTF_VER "SCST_INTF_VER"
#define SCST_CONST_INTF_VER "SCST_CONST_INTF_VER"
#define DEV_USER_INTF_VER "DEV_USER_INTF_VER"
EOF
add_file "$tmp_itf_ver" "include/scst/scst_itf_ver.h"
rm -f "$tmp_itf_ver"
fi
done \
| process_patch "${s}.diff"
} |
process_patch "${s}.diff"
done
{