From 579e9620c659883a1af1b94014587cc0086b3d92 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 20 Jan 2016 21:31:38 +0000 Subject: [PATCH] rules.mk: make the locked template available even if flock has not been built yet (fall back to unlocked shell command) Signed-off-by: Felix Fietkau SVN-Revision: 48414 --- rules.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rules.mk b/rules.mk index f0c813620a..11ed80950a 100644 --- a/rules.mk +++ b/rules.mk @@ -333,12 +333,16 @@ endef # Execute commands under flock # $(1) => The shell expression. # $(2) => The lock name. If not given, the global lock will be used. -define locked +ifneq ($(wildcard $(STAGING_DIR_HOST)/bin/flock),) + define locked SHELL= \ - $(STAGING_DIR_HOST)/bin/flock \ + flock \ $(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \ -c '$(subst ','\'',$(1))' -endef + endef +else + locked=$(1) +endif # Recursively copy paths into another directory, purge dangling # symlinks before.