diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2022-09-26 10:09:30 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2022-09-26 08:31:02 +0000 |
| commit | 1a62f6efae96b7472cea698564b5b7ae731e3e02 (patch) | |
| tree | 62fa3ef53ff3f2d2606190abb710d32bee1757c3 | |
| parent | adbdfdf7489e1909f29e2dd02edb7d15c258ed19 (diff) | |
fix(Makefile): fix the `make commit-template` target
make commit template expects the CWD of make to be a git repository.
While this is true most of the time, there are cases where we use the
Makefile just for install dependencies
(e.g. https://github.com/FDio/hicn/blob/master/Dockerfile.dev#L22) and
in that case we do not copy the .git folder.
The solution is to check if the current make directory is actually a
.git repository.
Ticket: HICN-796
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I12912c76c9ddfa3b7a19d0faf8c84b178ca728bf
Signed-off-by: Mauro Sardara <msardara@cisco.com>
| -rw-r--r-- | Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -37,6 +37,11 @@ OS_ID = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\ OS_VERSION_ID = $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') endif +# +# Git Repo detection +# +GIT_INFO = $(shell git -C . rev-parse 2>/dev/null; echo $$?) + ifeq ($(shell uname),Darwin) BUILD_HICNPLUGIN := OFF PUNTING := OFF @@ -85,14 +90,16 @@ help: .PHONY = commit-template commit-template: - @git config commit.template $(COMMIT_TEMPLATE_FILE) +ifeq ($(GIT_INFO),0) + git config commit.template $(COMMIT_TEMPLATE_FILE) +endif .PHONY = vpp-dep vpp-dep: VERSION_PATH=$(VERSIONFILE) sudo -E $(SHELL) scripts/install-vpp.sh .PHONY = dep -dep: vpp-dep #commit-template +dep: vpp-dep ifeq ($(shell uname),Darwin) brew install $(MACOS_DEPENDS) else ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) |