From 662109a54b9ecf5414dbda8700f4001c1b08d143 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Thu, 26 Mar 2015 15:07:47 +0000 Subject: [PATCH] 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 --- Makefile | 6 ++++-- 1 file 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}: