sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/gitconfig: Use make in git hooks

Browse Source 
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>
This commit is contained in:
Alex Thiessen 2018-01-04 15:16:23 +00:00 committed by Martin Roth
parent 687b96155c
commit 7bcd6ecea6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc
View File

@ -574,7 +574,7 @@ update:
dongle.py -c /dev/term/1 $(obj)/coreboot.rom EOF dongle.py -c /dev/term/1 $(obj)/coreboot.rom EOF
gitconfig: gitconfig:
util/gitconfig/gitconfig.sh util/gitconfig/gitconfig.sh "$(MAKE)"
include util/crossgcc/Makefile.inc include util/crossgcc/Makefile.inc

8
util/gitconfig/gitconfig.sh
View File

@ -15,6 +15,10 @@
## GNU General Public License for more details. ## 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}" ]; } if ! { cdup="$(git rev-parse --show-cdup 2>/dev/null)" && [ -z "${cdup}" ]; }
then then
echo "Error: Not in root of a git repository" 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}" ] \ if [ util/gitconfig/${hook} -nt "${coreboot_hooks}/${hook}" ] \
|| [ ! -x "${coreboot_hooks}/${hook}" ] || [ ! -x "${coreboot_hooks}/${hook}" ]
then then
sed -e "s,%MAKE%,remake,g" util/gitconfig/$hook \ sed -e "s,%MAKE%,${MAKE},g" util/gitconfig/$hook \
> "${coreboot_hooks}/${hook}" > "${coreboot_hooks}/${hook}"
chmod +x "${coreboot_hooks}/${hook}" chmod +x "${coreboot_hooks}/${hook}"
fi fi
@ -39,7 +43,7 @@ for submodule in 3rdparty/blobs libhwbase libgfxinit; do
if [ util/gitconfig/commit-msg -nt "${hooks}/commit-msg" ] \ if [ util/gitconfig/commit-msg -nt "${hooks}/commit-msg" ] \
|| [ ! -x "${hooks}/commit-msg" ] || [ ! -x "${hooks}/commit-msg" ]
then then
sed -e "s,%MAKE%,remake,g" util/gitconfig/commit-msg \ sed -e "s,%MAKE%,${MAKE},g" util/gitconfig/commit-msg \
> "${hooks}/commit-msg" > "${hooks}/commit-msg"
chmod +x "${hooks}/commit-msg" chmod +x "${hooks}/commit-msg"
fi fi