Skip to content
Snippets Groups Projects
Commit 0fb50ebe authored by Martine Lenders's avatar Martine Lenders
Browse files

pkg: do not build concurrently

parent 77cf00bd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 5 deletions
pkg/pkg.mk
+ 13
− 5
View file @ 0fb50ebe
...@@ -4,13 +4,20 @@ ...@@ -4,13 +4,20 @@
PKG_DIR?=$(CURDIR) PKG_DIR?=$(CURDIR)
PKG_BUILDDIR?=$(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME) PKG_BUILDDIR?=$(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME)
.PHONY: git-download .PHONY: git-download clean
ifneq (,$(wildcard $(PKG_DIR)/patches))
git-download: $(PKG_BUILDDIR)/.git-patched
else
git-download: $(PKG_BUILDDIR)/.git-downloaded git-download: $(PKG_BUILDDIR)/.git-downloaded
endif
GIT_APPLY_PATCHES:=if test -d "$(PKG_DIR)"/patches; then \ ifneq (,$(wildcard $(PKG_DIR)/patches))
git -C "$(PKG_BUILDDIR)" am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch; \ $(PKG_BUILDDIR)/.git-patched: $(PKG_BUILDDIR)/.git-downloaded $(PKG_DIR)/Makefile $(PKG_DIR)/patches/*.patch
fi git -C $(PKG_BUILDDIR) checkout -f $(PKG_VERSION)
git -C $(PKG_BUILDDIR) am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch
touch $@
endif
$(PKG_BUILDDIR)/.git-downloaded: $(PKG_BUILDDIR)/.git-downloaded:
rm -Rf $(PKG_BUILDDIR) rm -Rf $(PKG_BUILDDIR)
...@@ -21,9 +28,10 @@ $(PKG_BUILDDIR)/.git-downloaded: ...@@ -21,9 +28,10 @@ $(PKG_BUILDDIR)/.git-downloaded:
clean:: clean::
@test -d $(PKG_BUILDDIR) && { \ @test -d $(PKG_BUILDDIR) && { \
rm $(PKG_BUILDDIR)/.git-patched ; \
git -C $(PKG_BUILDDIR) clean -f ; \ git -C $(PKG_BUILDDIR) clean -f ; \
git -C $(PKG_BUILDDIR) checkout "$(PKG_VERSION)"; \ git -C $(PKG_BUILDDIR) checkout "$(PKG_VERSION)"; \
$(GIT_APPLY_PATCHES) ; \ make $(PKG_BUILDDIR)/.git-patched ; \
touch $(PKG_BUILDDIR)/.git-downloaded ; \ touch $(PKG_BUILDDIR)/.git-downloaded ; \
} > /dev/null 2>&1 || true } > /dev/null 2>&1 || true
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment