summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2015-03-26 15:07:47 +0000
committerSandrine Bailleux <sandrine.bailleux@arm.com>2015-03-26 15:55:34 +0000
commit662109a54b9ecf5414dbda8700f4001c1b08d143 (patch)
tree23f3c95fbd1eb06a300cbe258ebea9e05853ec4f
parent3b982be3b374cdc4947e23dd122f748dc7680d09 (diff)
downloadarm-trusted-firmware-662109a54b9ecf5414dbda8700f4001c1b08d143.tar.gz
Bug Fix: Fix checkpatch rule in Makefile
The shell command used to list all files but the libc's ones introduced in commit 95d5353c33 was incorrect. It was listing subdirectories without referencing their parent directories. This patch fixes it. Also, the command used to invoke the checkpatch.pl script is now printed when V=1. Change-Id: Ie2f1e74f60d77e38c25e717cffa44ca03baec7b2
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9d93a944b..aefcd2c6b 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,9 @@ CHECK_IGNORE = --ignore COMPLEX_MACRO \
CHECKPATCH_ARGS = --no-tree --no-signoff ${CHECK_IGNORE}
CHECKCODE_ARGS = --no-patch --no-tree --no-signoff ${CHECK_IGNORE}
# Do not check the coding style on C library files
-CHECK_PATHS = $(shell ls -I include -I lib) $(shell ls -I stdlib include) $(shell ls -I stdlib lib)
+CHECK_PATHS = $(shell ls -I include -I lib) \
+ $(addprefix include/,$(shell ls -I stdlib include)) \
+ $(addprefix lib/,$(shell ls -I stdlib lib))
ifeq (${V},0)
Q=@
@@ -371,7 +373,7 @@ checkcodebase: locate-checkpatch
checkpatch: locate-checkpatch
@echo " CHECKING STYLE"
- @git log -p ${BASE_COMMIT}..HEAD -- ${CHECK_PATHS} | ${CHECKPATCH} ${CHECKPATCH_ARGS} - || true
+ ${Q}git log -p ${BASE_COMMIT}..HEAD -- ${CHECK_PATHS} | ${CHECKPATCH} ${CHECKPATCH_ARGS} - || true
.PHONY: ${CRTTOOL}
${CRTTOOL}: