summaryrefslogtreecommitdiffstats
path: root/rfc.sh
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2016-09-05 11:39:10 +0200
committerNiels de Vos <ndevos@redhat.com>2016-09-12 01:33:12 -0700
commit00d9abd401ed5d6d78e9641ea31fe0e677f34eb9 (patch)
tree2f853c6b7bb60ca87e45d18094a44a2b1e452f78 /rfc.sh
parentc4e9ec653c946002ab6d4c71ee8e6df056438a04 (diff)
build: move checkpatch.pl to build-aux
There is no need for checkpatch.pl to be in extras/, it is used similar to other scripts that are placed in build-aux/. Change-Id: Id0f4db1666d83dad31687aa7aadae128fc14c016 BUG: 1198849 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/15400 Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'rfc.sh')
-rwxr-xr-xrfc.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/rfc.sh b/rfc.sh
index d405a67d6fc..f91527421dc 100755
--- a/rfc.sh
+++ b/rfc.sh
@@ -100,9 +100,9 @@ check_patches_for_coding_style()
{
git fetch origin;
- check_patch_script=./extras/checkpatch.pl
- if [ ! -e ./extras/checkpatch.pl ] ; then
- echo "checkpatch is not executable .. abort"
+ check_patch_script=./build-aux/checkpatch.pl
+ if [ ! -e ${check_patch_script} ] ; then
+ echo "${check_patch_script} is not executable .. abort"
exit 1
fi
@@ -118,13 +118,13 @@ check_patches_for_coding_style()
if [ "$RES" -eq 1 ] ; then
echo "Errors caught, get details by:"
echo " git format-patch --stdout origin/${branch}..${head} \\"
- echo " | ./extras/checkpatch.pl --gerrit-url ${GERRIT_URL} -"
+ echo " | ${check_patch_script} --gerrit-url ${GERRIT_URL} -"
echo "and correct errors"
exit 1
elif [ "$RES" -eq 2 ] ; then
echo "Warnings caught, get details by:"
echo " git format-patch --stdout origin/${branch}..${head} \\"
- echo " | ./extras/checkpatch.pl --gerrit-url ${GERRIT_URL} -"
+ echo " | ${check_patch_script} --gerrit-url ${GERRIT_URL} -"
echo -n "Do you want to continue anyway [no/yes]: "
read yesno
if [ "${yesno}" != "yes" ] ; then