InstallDev: Move the "find" out of the lock critical section.

[openwrt/svn-archive/archive.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 2d3a5d09668c3003ec6cd4873c87a1fa52967f43..06f3a839c6187b920cdb9226e42af8cf5685ea11 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -132,8 +132,11 @@ define Build/DefaultTargets
                $(call $(hook),$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)$(sep)\
        )
        if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \
-               (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(STAGING_FILES_LIST)); \
-               $(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
+               (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(TMP_DIR)/stage-$(PKG_NAME).files); \
+               $(call locked, \
+                       mv $(TMP_DIR)/stage-$(PKG_NAME).files $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) && \
+                       $(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
+               ,staging-dir); \
        fi
        rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
        touch $$@