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

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

Browse Source 
pkg.mk: do not use user identidy when applying patches
This commit is contained in:
Martine Lenders 2018-09-19 14:53:38 +02:00 committed by GitHub
commit dd470dc55f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 git-download: $(PKG_BUILDDIR)/.git-downloaded
endif endif
GITFLAGS ?= -c user.email=buildsystem@riot -c user.name="RIOT buildsystem"
GITAMFLAGS ?= --no-gpg-sign --ignore-whitespace GITAMFLAGS ?= --no-gpg-sign --ignore-whitespace
ifneq (,$(wildcard $(PKG_DIR)/patches)) ifneq (,$(wildcard $(PKG_DIR)/patches))
$(PKG_BUILDDIR)/.git-patched: $(PKG_BUILDDIR)/.git-downloaded $(PKG_DIR)/Makefile $(PKG_DIR)/patches/*.patch $(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) 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 $@ touch $@
endif endif