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

scripts/generate-kernel-patch: Use krel for qla2xxx patch paths

Browse Source 
Fix mismatch where generate-kernel-patch keyed paths by full_kver
(with ‘^’) but in-tree patches were written under krel
(before ‘^’). Derive krel=${full_kver/^*} and use it for qla2xxx path
resolution.
This commit is contained in:
Gleb Chesnokov
2025-09-30 18:09:11 +03:00
parent 90c26fa844
commit 9543060a2c
6 changed files with 65 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/generate-kernel-patch
+11 -7
View File
@@ -236,7 +236,8 @@ fi
# Strip patch level from the kernel version number.
full_kver="$1"
kver="$(kernel_version "$1")"
kver="$(kernel_version "${full_kver}")"
krel=${full_kver/^*}
# See also commit 89d9a567952b ("[SCSI] add support for per-host cmd pools";
# v3.15).
@@ -490,11 +491,11 @@ add_file "iscsi-scst/README_in-tree" "Documentation/scst/README.iscsi" \
if [ "${qla2x00t}" = "true" ]; then
( cd qla2x00t && "$PWD/generate-in-tree-patches" "$1" ) || exit $?
( cd qla2x00t && "$PWD/generate-in-tree-patches" "${full_kver}" ) || exit $?
for f in qla2x00t/in-tree-patches/"$1"/*.patch; do
for f in qla2x00t/in-tree-patches/"${krel}"/*.patch; do
[ -e "$f" ] || continue
g="${f#qla2x00t/in-tree-patches/$1/}"
g="${f#qla2x00t/in-tree-patches/"${krel}"/}"
g="${g%.patch}"
add_patch "${f}" "drivers/scsi/qla2xxx/${g}"
done
@@ -516,12 +517,14 @@ if [ "${qla2x00t}" = "true" ]; then
elif [ "${qla2x00t_32gbit}" = "true" ]; then
( cd qla2x00t-32gbit && "$PWD/generate-in-tree-patches" "$1" ) || exit $?
( cd qla2x00t-32gbit && "$PWD/generate-in-tree-patches" "${full_kver}" ) || exit $?
for f in qla2x00t-32gbit/in-tree-patches/"$1"/*.patch; do
for f in qla2x00t-32gbit/in-tree-patches/"${krel}"/*.patch; do
[ -e "$f" ] || continue
g="${f#qla2x00t-32gbit/in-tree-patches/$1/}"
g="${f#qla2x00t-32gbit/in-tree-patches/"${krel}"/}"
g="${g%.patch}"
if [ "$g" = "qla.h" ]; then
add_patch "${f}" "include/trace/events/${g}"
else
@@ -531,6 +534,7 @@ elif [ "${qla2x00t_32gbit}" = "true" ]; then
for f in qla2x00t-32gbit/qla2x00-target/*.[ch]; do
[ -e "$f" ] || continue
add_file "${f}" "drivers/scsi/qla2xxx/${f#qla2x00t-32gbit/qla2x00-target/}"
done
scripts/run-regression-tests
+3 -3
View File
@@ -210,11 +210,11 @@ function generate_kernel_patch {
kver="$(kernel_version "${1/^*}")"
driver_options=(-l)
"${scriptsdir}"/generate-kernel-patch "${driver_options[@]}" $2 "$1" > "${patchfile}"
"${scriptsdir}"/generate-kernel-patch "${driver_options[@]}" "$2" "$1" > "${patchfile}"
"${scriptsdir}"/generate-kernel-patch "${driver_options[@]}" -n $2 "$1" > "${patchfile_m}"
"${scriptsdir}"/generate-kernel-patch "${driver_options[@]}" -n "$2" "$1" > "${patchfile_m}"
"${scriptsdir}"/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