diff options
| author | Alex Thiessen <alex.thiessen.de+coreboot@gmail.com> | 2018-01-04 15:16:23 +0000 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-01-23 05:18:14 +0000 |
| commit | 7bcd6ecea625cbe528633617c51e09f376368202 (patch) | |
| tree | 04dec3c7b9b5a9a0a2009d95b4bd59f70a40fa14 | |
| parent | 687b96155cbd6c3c03dcc1bccdbe5104cd9db74b (diff) | |
| download | coreboot-7bcd6ecea625cbe528633617c51e09f376368202.tar.xz | |
util/gitconfig: Use `make` in git hooks
As the code was moved from the Makefile.inc to a separate file in
commit 9ab8ae6a (util/gitconfig: Make gitconfig a bash script),`$(MAKE)`
was replaced by `remake`, introducing dependency on this tool which is
basically a `make` with debugging capabilities. Many developers don't
have `remake` installed, leading to pre-commit hooks being not executed
properly. Apparently this was an unintentional change.
Furthermore, special treatment of `make` tool via the `%MAKE%`
substitution performed during hooks' deployment is still desired. Use
case is calling `remake gitconfig` to set `remake` as the `make` tool in
the hooks. To accomplish this, add a parameter that is passed from the
Makefile.inc to gitconfig.sh.
Change-Id: Ia78e06567b904b342dc9b7778569201fe02e6897
Signed-off-by: Alex Thiessen <alex.thiessen.de+coreboot@gmail.com>
Reviewed-on: https://review.coreboot.org/23096
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rwxr-xr-x | util/gitconfig/gitconfig.sh | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.inc b/Makefile.inc index f91e8d4297..0593d31f1f 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -574,7 +574,7 @@ update: dongle.py -c /dev/term/1 $(obj)/coreboot.rom EOF gitconfig: - util/gitconfig/gitconfig.sh + util/gitconfig/gitconfig.sh "$(MAKE)" include util/crossgcc/Makefile.inc diff --git a/util/gitconfig/gitconfig.sh b/util/gitconfig/gitconfig.sh index c2c4a69bbd..edfb6df742 100755 --- a/util/gitconfig/gitconfig.sh +++ b/util/gitconfig/gitconfig.sh @@ -15,6 +15,10 @@ ## GNU General Public License for more details. ## +# In the hooks, use the same `make` tool as used when running `make gitconfig`, +# e.g. `remake gitconfig` will set `remake` to be run by the hooks. +MAKE="${1:-make}" + if ! { cdup="$(git rev-parse --show-cdup 2>/dev/null)" && [ -z "${cdup}" ]; } then echo "Error: Not in root of a git repository" @@ -26,7 +30,7 @@ for hook in commit-msg pre-commit ; do if [ util/gitconfig/${hook} -nt "${coreboot_hooks}/${hook}" ] \ || [ ! -x "${coreboot_hooks}/${hook}" ] then - sed -e "s,%MAKE%,remake,g" util/gitconfig/$hook \ + sed -e "s,%MAKE%,${MAKE},g" util/gitconfig/$hook \ > "${coreboot_hooks}/${hook}" chmod +x "${coreboot_hooks}/${hook}" fi @@ -39,7 +43,7 @@ for submodule in 3rdparty/blobs libhwbase libgfxinit; do if [ util/gitconfig/commit-msg -nt "${hooks}/commit-msg" ] \ || [ ! -x "${hooks}/commit-msg" ] then - sed -e "s,%MAKE%,remake,g" util/gitconfig/commit-msg \ + sed -e "s,%MAKE%,${MAKE},g" util/gitconfig/commit-msg \ > "${hooks}/commit-msg" chmod +x "${hooks}/commit-msg" fi |