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

pkg.mk: do not use user identity when applying patches

Browse Source 
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.
This commit is contained in:
cladmi 2018-09-19 11:36:05 +02:00
parent 76558bd687
commit d154123c92
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/pkg.mk
View File

@ -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