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)

diff --git a/Makefile.inc b/Makefile.inc
index e495f4587e684feb885055c82c6aadf6763676f1..d36d15f458cf422f82ce07c10efd30f08bee8727 100644 (file)
--- 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 c4f57d683a303b6ebba3ac6fe79fe94f6a43ce58..6b902d813ec1ae8d578b626dda95bbed95e6e5e3 100755 (executable)
--- 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`