From 22cd659815b7126486f26a484d5eb92772f54d35 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 18 Feb 2022 13:35:47 +0100 Subject: [PATCH 1/3] make: pkg.mk: don't call `git am` if there are no patches --- pkg/pkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/pkg.mk b/pkg/pkg.mk index abc67d51bf..1299bec663 100644 --- a/pkg/pkg.mk +++ b/pkg/pkg.mk @@ -115,7 +115,7 @@ $(PKG_PATCHED): $(PKG_PATCHED_PREREQUISITES) $(call gen_dependency_files,$@.d,$(PKG_PATCHED_PREREQUISITES)) $(Q)$(GIT_IN_PKG) clean $(GIT_QUIET) -xdff '**' -e $(PKG_STATE:$(PKG_SOURCE_DIR)/%='%*') $(Q)$(GIT_IN_PKG) checkout $(GIT_QUIET) -f $(PKG_VERSION) - $(Q)$(GIT_IN_PKG) $(GITFLAGS) am $(GITAMFLAGS) $(PKG_PATCHES) Date: Fri, 18 Feb 2022 13:48:32 +0100 Subject: [PATCH 2/3] fixup! make: pkg.mk: don't call `git am` if there are no patches --- pkg/pkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/pkg.mk b/pkg/pkg.mk index 1299bec663..31c508e8bd 100644 --- a/pkg/pkg.mk +++ b/pkg/pkg.mk @@ -115,7 +115,7 @@ $(PKG_PATCHED): $(PKG_PATCHED_PREREQUISITES) $(call gen_dependency_files,$@.d,$(PKG_PATCHED_PREREQUISITES)) $(Q)$(GIT_IN_PKG) clean $(GIT_QUIET) -xdff '**' -e $(PKG_STATE:$(PKG_SOURCE_DIR)/%='%*') $(Q)$(GIT_IN_PKG) checkout $(GIT_QUIET) -f $(PKG_VERSION) - $(Q) test -n "$(PKG_PATCHES) && $(GIT_IN_PKG) $(GITFLAGS) am $(GITAMFLAGS) $(PKG_PATCHES) Date: Fri, 18 Feb 2022 13:48:44 +0100 Subject: [PATCH 3/3] REMOVEME: limit build --- .murdock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.murdock b/.murdock index 5c7f147bea..fada70754a 100755 --- a/.murdock +++ b/.murdock @@ -1,7 +1,7 @@ #!/bin/sh # uncomment and change this to limit builds, e.g., -#export BOARDS="samr21-xpro native" +export BOARDS="samr21-xpro native" # and / or #export APPS="examples/hello-world tests/unittests"