riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make/pkg: make git commands quiet

Browse Source
This commit is contained in:
Toon Stegen 2019-10-29 13:41:25 +01:00
parent 6ef9b4b340
commit f6b97a444e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/pkg.mk
View File

@ -20,21 +20,25 @@ else
git-download: git-ensure-version git-download: git-ensure-version
endif endif
ifeq ($(QUIET),1)
GIT_QUIET ?= --quiet
endif
GITFLAGS ?= -c user.email=buildsystem@riot -c user.name="RIOT buildsystem" GITFLAGS ?= -c user.email=buildsystem@riot -c user.name="RIOT buildsystem"
GITAMFLAGS ?= --no-gpg-sign --ignore-whitespace --whitespace=nowarn GITAMFLAGS ?= $(GIT_QUIET) --no-gpg-sign --ignore-whitespace --whitespace=nowarn
ifneq (,$(wildcard $(PKG_DIR)/patches)) ifneq (,$(wildcard $(PKG_DIR)/patches))
$(PKG_BUILDDIR)/.git-patched: git-ensure-version $(PKG_DIR)/Makefile $(PKG_DIR)/patches/*.patch $(PKG_BUILDDIR)/.git-patched: git-ensure-version $(PKG_DIR)/Makefile $(PKG_DIR)/patches/*.patch
$(Q)git -C $(PKG_BUILDDIR) checkout -f $(PKG_VERSION) $(Q)git -C $(PKG_BUILDDIR) checkout $(GIT_QUIET) -f $(PKG_VERSION)
$(Q)git $(GITFLAGS) -C $(PKG_BUILDDIR) am $(GITAMFLAGS) "$(PKG_DIR)"/patches/*.patch $(Q)git $(GITFLAGS) -C $(PKG_BUILDDIR) am $(GITAMFLAGS) "$(PKG_DIR)"/patches/*.patch
$(Q)touch $@ $(Q)touch $@
endif endif
git-ensure-version: $(PKG_BUILDDIR)/.git-downloaded git-ensure-version: $(PKG_BUILDDIR)/.git-downloaded
@if [ $(shell git -C $(PKG_BUILDDIR) rev-parse HEAD) != $(PKG_VERSION) ] ; then \ @if [ $(shell git -C $(PKG_BUILDDIR) rev-parse HEAD) != $(PKG_VERSION) ] ; then \
git -C $(PKG_BUILDDIR) clean -xdff ; \ git -C $(PKG_BUILDDIR) clean $(GIT_QUIET) -xdff ; \
git -C $(PKG_BUILDDIR) fetch "$(PKG_URL)" "$(PKG_VERSION)" ; \ git -C $(PKG_BUILDDIR) fetch $(GIT_QUIET) "$(PKG_URL)" "$(PKG_VERSION)" ; \
git -C $(PKG_BUILDDIR) checkout -f $(PKG_VERSION) ; \ git -C $(PKG_BUILDDIR) checkout $(GIT_QUIET) -f $(PKG_VERSION) ; \
touch $(PKG_BUILDDIR)/.git-downloaded ; \ touch $(PKG_BUILDDIR)/.git-downloaded ; \
fi fi