mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-18 19:21:26 +00:00
Patch from Bart Van Assche <bart.vanassche@gmail.com>:
I don't know when this was broken, but with the current SVN version, after having generated and applied a kernel patch for SCST, iscsi-scst doesn't build anymore. The patch below fixes this and also includes a cleanup patch for the generate-kernel-patch'>generate-kernel-patch script. The generated kernel patch has been tested with the 2.6.24 and 2.6.25.4 kernels (extracted kernel sources + applied patch + built kernel + installed kernel + reboot + load SCST modules). Signed-off-by: <bart.vanassche@gmail.com> git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@375 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
@@ -32,7 +32,9 @@ function add_patch {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -e "s:^--- [^ ]*:--- orig/$2:" -e "s:^+++ [^ ]*:+++ $2:" < "$1"
|
||||
sed -e "s:^--- [^ ]*:--- orig/linux-${kernel_version}/$2:" \
|
||||
-e "s:^+++ [^ ]*:+++ linux-${kernel_version}/$2:" \
|
||||
< "$1"
|
||||
}
|
||||
|
||||
# Generate a patch for a file to be added to the kernel source tree, and strip
|
||||
@@ -48,21 +50,20 @@ function add_file {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Skip any files generated by the kernel build process (*.mod.c).
|
||||
if [ "${1%.mod.c}" != "$1" ]; then
|
||||
return 0;
|
||||
fi
|
||||
|
||||
cat <<EOF
|
||||
diff -uprN orig/$2 $2
|
||||
--- orig/$2
|
||||
+++ $2
|
||||
# Only include files that were not generated by the build process
|
||||
# -- skip *.mod.c.
|
||||
if [ "$1" = "${1%.mod.c}" -a "$1" ]; then
|
||||
cat <<EOF
|
||||
diff -uprN orig/linux-${kernel_version}/$2 linux-${kernel_version}/$2
|
||||
--- orig/linux-${kernel_version}/$2
|
||||
+++ linux-${kernel_version}/$2
|
||||
@@ -0,0 +1,$(wc -l "$1" | { read a b; echo $a; }) @@
|
||||
EOF
|
||||
if [ "${2%.[ch]}" != "$2" ]; then
|
||||
sed -e 's/^/+/' -e 's/[ ]*$//g' < "$1"
|
||||
else
|
||||
sed -e 's/^/+/' < "$1"
|
||||
if [ "${2%.[ch]}" != "$2" ]; then
|
||||
sed -e 's/^/+/' -e 's/[ ]*$//g' < "$1"
|
||||
else
|
||||
sed -e 's/^/+/' < "$1"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -104,79 +105,71 @@ done
|
||||
|
||||
# General kernel patches.
|
||||
|
||||
for p in "${kpatch[@]}"
|
||||
do
|
||||
cat "$p"
|
||||
echo ''
|
||||
echo ''
|
||||
done
|
||||
cat "${kpatch[@]}"
|
||||
|
||||
|
||||
# Directory include/scst/
|
||||
|
||||
# Make sure the file iscsi-scst/iscsi_scst_itf_ver.h is up to date.
|
||||
make -C iscsi-scst include/iscsi_scst_itf_ver.h
|
||||
|
||||
for f in scst/include/*h
|
||||
do
|
||||
add_file "${f}" "linux-${kernel_version}/include/scst/${f#scst/include/}"
|
||||
add_file "${f}" "include/scst/${f#scst/include/}"
|
||||
done
|
||||
|
||||
for f in iscsi-scst/include/*h
|
||||
do
|
||||
add_file "${f}" "linux-${kernel_version}/include/scst/${f#iscsi-scst/include/}"
|
||||
add_file "${f}" "include/scst/${f#iscsi-scst/include/}"
|
||||
done
|
||||
|
||||
|
||||
# Directory drivers/
|
||||
|
||||
add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kernel_version}.patch" \
|
||||
"linux-${kernel_version}/drivers/Kconfig"
|
||||
"drivers/Kconfig"
|
||||
|
||||
add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kernel_version}.patch"\
|
||||
"linux-${kernel_version}/drivers/Makefile"
|
||||
"drivers/Makefile"
|
||||
|
||||
|
||||
# Directory drivers/scst/
|
||||
|
||||
add_file "scst/kernel/in-tree/Kconfig.scst" \
|
||||
"linux-${kernel_version}/drivers/scst/Kconfig"
|
||||
add_file "scst/kernel/in-tree/Makefile.scst" \
|
||||
"linux-${kernel_version}/drivers/scst/Makefile"
|
||||
add_file "scst/kernel/in-tree/Kconfig.scst" "drivers/scst/Kconfig"
|
||||
|
||||
add_file "scst/kernel/in-tree/Makefile.scst" "drivers/scst/Makefile"
|
||||
|
||||
add_file "scst/README" "Documentation/scst/README.scst"
|
||||
|
||||
for f in scst/src/*.[ch]
|
||||
do
|
||||
add_file ${f} linux-${kernel_version}/drivers/scst/${f#scst/src/}
|
||||
echo ''
|
||||
echo ''
|
||||
add_file "${f}" "drivers/scst/${f#scst/src/}"
|
||||
done
|
||||
|
||||
|
||||
# Directory drivers/scst/dev_handlers/
|
||||
|
||||
add_file "scst/kernel/in-tree/Makefile.dev_handlers" \
|
||||
"linux-${kernel_version}/drivers/scst/dev_handlers/Makefile"
|
||||
"drivers/scst/dev_handlers/Makefile"
|
||||
|
||||
for f in scst/src/dev_handlers/*.[ch]
|
||||
do
|
||||
add_file ${f} linux-${kernel_version}/drivers/scst/dev_handlers/${f#scst/src/dev_handlers/}
|
||||
echo ''
|
||||
echo ''
|
||||
add_file "${f}" "drivers/scst/dev_handlers/${f#scst/src/dev_handlers/}"
|
||||
done
|
||||
|
||||
|
||||
# Directory drivers/scst/iscsi-scst/
|
||||
|
||||
add_file "iscsi-scst/kernel/Makefile.in-kernel" \
|
||||
"linux-${kernel_version}/drivers/scst/iscsi-scst/Makefile"
|
||||
"drivers/scst/iscsi-scst/Makefile"
|
||||
|
||||
add_file "iscsi-scst/kernel/Kconfig" \
|
||||
"linux-${kernel_version}/drivers/scst/iscsi-scst/Kconfig"
|
||||
add_file "iscsi-scst/kernel/Kconfig" "drivers/scst/iscsi-scst/Kconfig"
|
||||
|
||||
add_file "iscsi-scst/README" "Documentation/scst/README.iscsi"
|
||||
|
||||
for f in iscsi-scst/kernel/*.[ch]
|
||||
do
|
||||
add_file "${f}" \
|
||||
"linux-${kernel_version}/drivers/scst/iscsi-scst/${f#iscsi-scst/kernel/}"
|
||||
echo ''
|
||||
echo ''
|
||||
add_file "${f}" "drivers/scst/iscsi-scst/${f#iscsi-scst/kernel/}"
|
||||
done
|
||||
|
||||
|
||||
@@ -185,20 +178,20 @@ done
|
||||
if false; then
|
||||
|
||||
add_file "qla2x00t/qla2x00-target/Makefile.in-kernel" \
|
||||
"linux-${kernel_version}/drivers/scst/qla2x00-target/Makefile"
|
||||
"drivers/scst/qla2x00-target/Makefile"
|
||||
|
||||
add_file "qla2x00t/qla2x00-target/Kconfig" \
|
||||
"linux-${kernel_version}/drivers/scst/qla2x00-target/Kconfig"
|
||||
"drivers/scst/qla2x00-target/Kconfig"
|
||||
|
||||
add_file "qla2x00t/qla2x_tgt_def.h" \
|
||||
"linux-${kernel_version}/drivers/scst/qla2x00-target/qla2x_tgt_def.h"
|
||||
"drivers/scst/qla2x00-target/qla2x_tgt_def.h"
|
||||
|
||||
add_file "qla2x00t/qla2x00-target/README" \
|
||||
"Documentation/scst/README.qla2x00t"
|
||||
|
||||
for f in qla2x00t/qla2x00-target/*.[ch]
|
||||
do
|
||||
add_file "${f}" \
|
||||
"linux-${kernel_version}/drivers/scst/qla2x00-target/${f#qla2x00t/qla2x00-target/}"
|
||||
echo ''
|
||||
echo ''
|
||||
add_file "${f}" "drivers/scst/qla2x00-target/${f#qla2x00t/qla2x00-target/}"
|
||||
done
|
||||
|
||||
fi
|
||||
@@ -207,18 +200,18 @@ fi
|
||||
# Directory drivers/infiniband/ulp/srpt/
|
||||
|
||||
add_patch "srpt/src/Kconfig.infiniband.Linux-${kernel_version}.patch" \
|
||||
"linux-${kernel_version}/drivers/infiniband/Kconfig"
|
||||
"drivers/infiniband/Kconfig"
|
||||
|
||||
add_patch "srpt/src/Makefile.infiniband.Linux-${kernel_version}.patch" \
|
||||
"linux-${kernel_version}/drivers/infiniband/Makefile"
|
||||
"drivers/infiniband/Makefile"
|
||||
|
||||
add_file "srpt/src/Kconfig" "drivers/infiniband/ulp/srpt/Kconfig"
|
||||
add_file "srpt/src/Kconfig" "drivers/infiniband/ulp/srpt/Kconfig"
|
||||
|
||||
add_file "srpt/src/Makefile.in_kernel" "drivers/infiniband/ulp/srpt/Makefile"
|
||||
add_file "srpt/src/Makefile.in_kernel" "drivers/infiniband/ulp/srpt/Makefile"
|
||||
|
||||
add_file "srpt/README" "Documentation/scst/README.srpt"
|
||||
|
||||
for f in srpt/src/*.[ch]
|
||||
do
|
||||
add_file ${f} linux-${kernel_version}/drivers/infiniband/ulp/srpt/${f#srpt/src/}
|
||||
echo ''
|
||||
echo ''
|
||||
add_file "${f}" "drivers/infiniband/ulp/srpt/${f#srpt/src/}"
|
||||
done
|
||||
|
||||
@@ -7,5 +7,5 @@ scst-y += scst_proc.o
|
||||
scst-y += scst_mem.o
|
||||
scst-y += scst_debug.o
|
||||
|
||||
obj-$(CONFIG_SCSI_TARGET) += scst.o dev_handlers/
|
||||
obj-$(CONFIG_SCSI_TARGET) += scst.o dev_handlers/ iscsi-scst/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user