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

Merge pull request #9015 from cladmi/pr/pkg/do_not_sign_patches

Browse Source 
pkg/pkg.mk: do not sign when applying patches
This commit is contained in:
Kaspar Schleiser 2018-04-25 09:40:10 +02:00 committed by GitHub
commit 8d6f5ddfcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/pkg.mk
View File

@ -19,10 +19,12 @@ else
git-download: $(PKG_BUILDDIR)/.git-downloaded git-download: $(PKG_BUILDDIR)/.git-downloaded
endif endif
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 --ignore-whitespace "$(PKG_DIR)"/patches/*.patch git -C $(PKG_BUILDDIR) am $(GITAMFLAGS) "$(PKG_DIR)"/patches/*.patch
touch $@ touch $@
endif endif