aboutsummaryrefslogtreecommitdiff
path: root/target/jffs2
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2006-04-07 20:30:43 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2006-04-07 20:30:43 +0000
commitee66f55213b1fd5a006e8638d524e490c9f65f3b (patch)
tree79a582b6718d15377af224e818304c73f5271c3b /target/jffs2
parentf333602f7309753302b61c8a2aa1e217d95121e4 (diff)
downloadbuildroot-ee66f55213b1fd5a006e8638d524e490c9f65f3b.tar.gz
buildroot-ee66f55213b1fd5a006e8638d524e490c9f65f3b.tar.bz2
rework fakeroot handling to avoid races during parallel make causing several
fakeroot instances stomping eachother's temp files.
Diffstat (limited to 'target/jffs2')
-rw-r--r--target/jffs2/jffs2root.mk27
1 files changed, 13 insertions, 14 deletions
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index c5efae5254..2c6ad5eb75 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -38,32 +38,31 @@ JFFS2_TARGET := $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT))
# value of MKFS_JFFS2 to either the previously installed copy or the one
# just built.
#
-$(JFFS2_TARGET): host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env mtd-host
+$(JFFS2_TARGET): host-fakeroot makedevs mtd-host
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/share/man
@rm -rf $(TARGET_DIR)/usr/info
-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
+ rm -f $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
-$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
+ -i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
chown -R root:root $(TARGET_DIR)
# Use fakeroot to pretend to create all needed device nodes
$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
- $(STAGING_DIR)/bin/makedevs \
- -d $(TARGET_DEVICE_TABLE) \
- $(TARGET_DIR)
+ -i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
+ $(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
# Use fakeroot so mkfs.jffs2 believes the previous fakery
$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
- $(MKFS_JFFS2) \
- $(JFFS2_OPTS) \
- -d $(BUILD_DIR)/root \
- -o $(JFFS2_TARGET)
+ -i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
+ $(MKFS_JFFS2) $(JFFS2_OPTS) \
+ -d $(BUILD_DIR)/root -o $(JFFS2_TARGET)
+ -@rm -f $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
@ls -l $(JFFS2_TARGET)
JFFS2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_COPYTO)))