From dea13331a1967b6cdab2234303fdf8d430243bd6 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Fri, 4 May 2018 09:19:07 -0600 Subject: util/lint: Ignore whitespace, newlines, and licenses in vbt files Change-Id: I84f612db058d83936ddd5a6baa32c993e5b0f594 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/26064 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- util/lint/lint-000-license-headers | 1 + util/lint/lint-extended-015-final-newlines | 2 +- util/lint/lint-stable-003-whitespace | 2 +- util/lint/lint-stable-009-old-licenses | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers index 103c1f0de8..43be380025 100755 --- a/util/lint/lint-000-license-headers +++ b/util/lint/lint-000-license-headers @@ -34,6 +34,7 @@ EXAMPLE|\ \.jpg$|\ \.cksum$|\ \.bin$|\ +\.vbt$|\ \.hex$|\ \.patch$|\ _shipped$|\ diff --git a/util/lint/lint-extended-015-final-newlines b/util/lint/lint-extended-015-final-newlines index 5c60ddf54d..4ddd00bf74 100755 --- a/util/lint/lint-extended-015-final-newlines +++ b/util/lint/lint-extended-015-final-newlines @@ -17,7 +17,7 @@ LC_ALL=C export LC_ALL EXCLUDED_DIRS='src/vendorcode/\|util/romcc/\|cbfstool/lzma/\|cbfstool/lz4/\|Documentation/\|build/\|3rdparty/\|\.git/\|coreboot-builds/\|util/nvidia/cbootimage/' -EXCLUDED_FILES='\.jpg$\|\.cksum$\|\.bin$\|\.hex$\|\.ico$\|\.o$\|\.bz2$\|\.xz$\|^.tmpconfig\|\.pyc$\|_shipped$\|sha256$\|\.png$\|\.patch$' +EXCLUDED_FILES='\.jpg$\|\.cksum$\|\.bin$\|\.vbt$\|\.hex$\|\.ico$\|\.o$\|\.bz2$\|\.xz$\|^.tmpconfig\|\.pyc$\|_shipped$\|sha256$\|\.png$\|\.patch$' # Use git ls-files if the code is in a git repo, otherwise use find. if [ -n "$(command -v git)" ] && \ diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index 9352117c4b..d749f3700e 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -15,5 +15,5 @@ # DESCR: Check for superfluous whitespace in the tree LC_ALL=C export LC_ALL -grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\|\|\|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$|\.ttf$|\.woff$|\.png$|\.eot$)"` | \ +grep -l "[[:space:]][[:space:]]*$" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage$|\|\|\|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$|\.ttf$|\.woff$|\.png$|\.eot$|\.vbt$)"` | \ sed -e "s,^.*$,File & has lines ending with whitespace.," diff --git a/util/lint/lint-stable-009-old-licenses b/util/lint/lint-stable-009-old-licenses index fdc76aa543..6e6dc1cb61 100755 --- a/util/lint/lint-stable-009-old-licenses +++ b/util/lint/lint-stable-009-old-licenses @@ -25,6 +25,7 @@ HEADER_EXCLUDED="\ \.jpg$|\ \.cksum$|\ \.bin$|\ +\.vbt$|\ \.hex$|\ \.patch$|\ _shipped$|\ -- cgit v1.2.3