aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-11-04 12:42:37 +0000
committerMichael Büsch <mb@bu3sch.de>2010-11-04 12:42:37 +0000
commit09f68e4a53d04a2371dd830faa0959621d63dad4 (patch)
treebfcf12119a59aa02eccb97d1f024cc5c2bc5f7b7
parent8238fd39712b717c4a0a40295664b85646302b80 (diff)
downloadupstream-09f68e4a53d04a2371dd830faa0959621d63dad4.tar.gz
upstream-09f68e4a53d04a2371dd830faa0959621d63dad4.tar.bz2
upstream-09f68e4a53d04a2371dd830faa0959621d63dad4.zip
InstallDev: Move the "find" out of the lock critical section.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23858 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/package.mk b/include/package.mk
index 712b793d0d..06f3a839c6 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -132,8 +132,9 @@ 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 ./ > $(TMP_DIR)/stage-$(PKG_NAME).files); \
$(call locked, \
- (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(STAGING_FILES_LIST)); \
+ mv $(TMP_DIR)/stage-$(PKG_NAME).files $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) && \
$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
,staging-dir); \
fi