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>
diff --git a/Makefile.inc b/Makefile.inc
index f91e8d4..0593d31 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -574,7 +574,7 @@
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 c2c4a69..edfb6df 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 @@
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 @@
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