diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-03-08 11:06:25 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-03-09 05:29:08 +0100 |
| commit | 8ebd11eab999654873010e706b95e5fe5855ea64 (patch) | |
| tree | 6f72a8f4ccf68cd7c1128ad1ab490031556f2b0c | |
| parent | 0a50084e4d7535c5eb86dc3bf18c357eec4aa69a (diff) | |
Fix lint-stable checkin hooks on MacOS X
- wc adds a number of leading spaces which broke cut
- sed can't replace spaces with new lines, so use tr for that.
- make sure directories are created if they're not there.
Change-Id: Ia0db059683abe3d97b0ab6feaece660a1f4e5079
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/774
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rwxr-xr-x | util/lint/lint-stable-002-build-dir-handling | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc b/Makefile.inc index e495f4587e..d36d15f458 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -225,7 +225,7 @@ lint lint-stable: grep "^# DESCR:" $$script | sed "s,.*DESCR: *,," ; \ echo ========; \ $$script > $$LINTLOG; \ - if [ `wc -l $$LINTLOG | cut -d' ' -f1` -eq 0 ]; then \ + if [ `echo $$( wc -l $$LINTLOG ) | cut -d' ' -f1` -eq 0 ]; then \ printf "success\n\n"; \ else \ echo test failed: ; \ diff --git a/util/lint/lint-stable-002-build-dir-handling b/util/lint/lint-stable-002-build-dir-handling index c4f57d683a..6b902d813e 100755 --- a/util/lint/lint-stable-002-build-dir-handling +++ b/util/lint/lint-stable-002-build-dir-handling @@ -33,7 +33,7 @@ fi # $1: object directory run_printall() { -$MAKE CONFIG_CCACHE=n CONFIG_SCANBUILD_ENABLE=n NOMKDIR=1 DOTCONFIG=$TMPCONFIG obj=$1 printall |sed -e "s,^ *,," -e "s, ,\n,g" -e "s,^ramstage-objs:=,," -e "s,mainboard/[^/]*/[^/]*/,.../," |grep "/static.*\.[co]" |sort |tr '\012\015' ' ' |sed -e "s, *, ,g" -e "s, *$,," +$MAKE CONFIG_CCACHE=n CONFIG_SCANBUILD_ENABLE=n NOMKDIR=1 DOTCONFIG=$TMPCONFIG obj=$1 printall |sed -e "s,^ *,," -e "s,^ramstage-objs:=,," -e "s,mainboard/[^/]*/[^/]*/,.../," |tr " " "\n"|grep "/static.*\.[co]" |sort |tr '\012\015' ' ' |sed -e "s, *, ,g" -e "s, *$,," } # find GNU make @@ -49,7 +49,7 @@ fi # prepare a config to use TMPCONFIG=`mktemp .tmpconfig.XXXXXX` rm -f $TMPCONFIG -$MAKE NOMKDIR=1 DOTCONFIG=$TMPCONFIG allyesconfig >/dev/null +$MAKE DOTCONFIG=$TMPCONFIG allyesconfig >/dev/null # look up parent directory PARENTDIR=`dirname $PWD` |