projects
/
hvutilities.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hvsp: do not send version for series=1
[hvutilities.git]
/
scripts
/
kernel-send-patches.sh
diff --git
a/scripts/kernel-send-patches.sh
b/scripts/kernel-send-patches.sh
index
9aae586
..
10d93ef
100755
(executable)
--- a/
scripts/kernel-send-patches.sh
+++ b/
scripts/kernel-send-patches.sh
@@
-262,7
+262,9
@@
if [ x"${cover}" = x"yes" ]; then
GIT_FORMAT_PATCH_OPTS="${GIT_FORMAT_PATCH_OPTS} --cover-letter"
fi
GIT_FORMAT_PATCH_OPTS="${GIT_FORMAT_PATCH_OPTS} --cover-letter"
fi
-if [ x"${series}" != x"" ]; then
+series_prefix=""
+if [ x"${series}" != x"" -a x"${series}" != x"1" ]; then
+ series_prefix="v${series}-"
GIT_FORMAT_PATCH_OPTS="${GIT_FORMAT_PATCH_OPTS} -v ${series}"
fi
GIT_FORMAT_PATCH_OPTS="${GIT_FORMAT_PATCH_OPTS} -v ${series}"
fi
@@
-270,10
+272,10
@@
git format-patch ${GIT_FORMAT_PATCH_OPTS} --output-directory=${srcdir} ${base_br
if [ x"${cover}" = x"yes" ]; then
# Replace subject line in cover letter:
if [ x"${cover}" = x"yes" ]; then
# Replace subject line in cover letter:
- sed -i -e "s/\*\*\* SUB.*/${subject}/" ${srcdir}/
v${series}-
0000-cover-letter.patch
+ sed -i -e "s/\*\*\* SUB.*/${subject}/" ${srcdir}/
${series_prefix}
0000-cover-letter.patch
# Replace blurb line in cover letter:
# Replace blurb line in cover letter:
- sed -i -e "/.*BLURB.*/{r /tmp/cover-letter.txt" -e 'd}' ${srcdir}/
v${series}-
0000-cover-letter.patch
+ sed -i -e "/.*BLURB.*/{r /tmp/cover-letter.txt" -e 'd}' ${srcdir}/
${series_prefix}
0000-cover-letter.patch
collect_email_addresses
fi
collect_email_addresses
fi
@@
-282,7
+284,7
@@
add_cc_list_addresses
# Check patches (except special case of cover letter patch):
for p in ${srcdir}/*.patch; do
# Check patches (except special case of cover letter patch):
for p in ${srcdir}/*.patch; do
- if [ x"$(basename ${p})" != x"
v${series}-
0000-cover-letter.patch" ]; then
+ if [ x"$(basename ${p})" != x"
${series_prefix}
0000-cover-letter.patch" ]; then
if [ x"${ignore_checkpatch_errors}" != x"" ]; then
set +e
CHECKPATCH_OPS="--ignore ${ignore_checkpatch_errors}"
if [ x"${ignore_checkpatch_errors}" != x"" ]; then
set +e
CHECKPATCH_OPS="--ignore ${ignore_checkpatch_errors}"