summaryrefslogtreecommitdiffstats
path: root/target/tar
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-04-07 20:30:43 +0000
committerEric Andersen <andersen@codepoet.org>2006-04-07 20:30:43 +0000
commitee66f55213b1fd5a006e8638d524e490c9f65f3b (patch)
tree79a582b6718d15377af224e818304c73f5271c3b /target/tar
parentf333602f7309753302b61c8a2aa1e217d95121e4 (diff)
downloadbuildroot-novena-ee66f55213b1fd5a006e8638d524e490c9f65f3b.tar.gz
buildroot-novena-ee66f55213b1fd5a006e8638d524e490c9f65f3b.zip
rework fakeroot handling to avoid races during parallel make causing several
fakeroot instances stomping eachother's temp files.
Diffstat (limited to 'target/tar')
-rw-r--r--target/tar/tarroot.mk28
1 files changed, 15 insertions, 13 deletions
diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 867adc1b9..cbf538653 100644
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -4,30 +4,32 @@
#
#############################################################
-TAR_OPTS := $(strip $(subst ",, $(BR2_TARGET_ROOTFS_TAR_OPTIONS)))
-#"
-tarroot: host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env
+TAR_OPTS:=$(strip $(BR2_TARGET_ROOTFS_TAR_OPTIONS))
+TAR_TARGET:=$(IMAGE).tar
+
+tarroot: host-fakeroot makedevs
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
@rm -rf $(TARGET_DIR)/usr/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.$(TAR_TARGET)
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
-$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
+ -i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(TAR_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.$(TAR_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) -- \
+ $(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
# Use fakeroot so tar believes the previous fakery
$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
- tar -c$(TAR_OPTS)f $(IMAGE).tar -C $(TARGET_DIR) .
+ -i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
+ -s $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) -- \
+ tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) .
+ -@rm -f $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
tarroot-source: