Skip to content
Snippets Groups Projects
Unverified Commit dd470dc5 authored by Martine Lenders's avatar Martine Lenders Committed by GitHub
Browse files

Merge pull request #9960 from cladmi/pr/make/pkg/riot_bs_git_am

pkg.mk: do not use user identidy when applying patches
parents 1fbd51f6 d154123c
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment