From d154123c92314a0c178d635207f204cbcc49f47d Mon Sep 17 00:00:00 2001 From: cladmi <gaetan.harter@fu-berlin.de> Date: Wed, 19 Sep 2018 11:36:05 +0200 Subject: [PATCH] pkg.mk: do not use user identity when applying patches Use fixed identity when applying patches, it fixes issues when they are not set in the build computer or if HOME is not exported. The commits are only used in the build system so adding the building user information is useless. --- pkg/pkg.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/pkg.mk b/pkg/pkg.mk index 24b7161442..076bf45cbf 100644 --- a/pkg/pkg.mk +++ b/pkg/pkg.mk @@ -19,12 +19,13 @@ else git-download: $(PKG_BUILDDIR)/.git-downloaded endif +GITFLAGS ?= -c user.email=buildsystem@riot -c user.name="RIOT buildsystem" GITAMFLAGS ?= --no-gpg-sign --ignore-whitespace ifneq (,$(wildcard $(PKG_DIR)/patches)) $(PKG_BUILDDIR)/.git-patched: $(PKG_BUILDDIR)/.git-downloaded $(PKG_DIR)/Makefile $(PKG_DIR)/patches/*.patch git -C $(PKG_BUILDDIR) checkout -f $(PKG_VERSION) - git -C $(PKG_BUILDDIR) am $(GITAMFLAGS) "$(PKG_DIR)"/patches/*.patch + git $(GITFLAGS) -C $(PKG_BUILDDIR) am $(GITAMFLAGS) "$(PKG_DIR)"/patches/*.patch touch $@ endif -- GitLab