-# $(3) => The filedescriptor used for the lock. Defaults to 1023.
-define locked
- ( $(STAGING_DIR_HOST)/bin/flock -x $(if $(3),$(3),1023) && \
- $(1) \
- ) $(if $(3),$(strip $(3)),1023)>$(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock
+ifneq ($(wildcard $(STAGING_DIR_HOST)/bin/flock),)
+ define locked
+ SHELL= \
+ flock \
+ $(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \
+ -c '$(subst ','\'',$(1))'
+ endef
+else
+ locked=$(1)
+endif
+
+# Recursively copy paths into another directory, purge dangling
+# symlinks before.
+# $(1) => File glob expression
+# $(2) => Destination directory
+define file_copy
+ for src_dir in $(sort $(foreach d,$(wildcard $(1)),$(dir $(d)))); do \
+ ( cd $$src_dir; find -type f -or -type d ) | \
+ ( cd $(2); while :; do \
+ read FILE; \
+ [ -z "$$FILE" ] && break; \
+ [ -L "$$FILE" ] || continue; \
+ echo "Removing symlink $(2)/$$FILE"; \
+ rm -f "$$FILE"; \
+ done; ); \
+ done; \
+ $(CP) $(1) $(2)
+endef
+
+# Calculate sha256sum of any plain file within a given directory
+# $(1) => Input directory
+# $(2) => If set, recurse into subdirectories
+define sha256sums
+ (cd $(1); find . $(if $(2),,-maxdepth 1) -type f -not -name 'sha256sums' -printf "%P\n" | sort | \
+ xargs -r $(STAGING_DIR_HOST)/bin/mkhash -n sha256 | sed -ne 's!^\(.*\) \(.*\)$$!\1 *\2!p' > sha256sums)