aboutsummaryrefslogtreecommitdiff
path: root/target/squashfs
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2005-06-24 07:26:33 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2005-06-24 07:26:33 +0000
commiteb0ee4509d3112d80cbb210b44fb682ba7033385 (patch)
tree54e5aafc886938962479f78fc7a43c5376777df2 /target/squashfs
parentafcdf8a01a2d54edb7a217f8c7c1e74e1fb8758b (diff)
downloadbuildroot-eb0ee4509d3112d80cbb210b44fb682ba7033385.tar.gz
buildroot-eb0ee4509d3112d80cbb210b44fb682ba7033385.tar.bz2
Finish implementing fakeroot handling so mksquashfs properly
inherits device table settings and device nodes, exactly as per mkfs* applications that support device tables natively.
Diffstat (limited to 'target/squashfs')
-rw-r--r--target/squashfs/squashfsroot.mk24
1 files changed, 15 insertions, 9 deletions
diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 50aaf58fed..4f4d76dba4 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -35,22 +35,28 @@ squashfs-dirclean:
#############################################################
squashfsroot: squashfs 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
+ # Use fakeroot to munge permissions and do root-like things
rm -f $(STAGING_DIR)/fakeroot.env
touch $(STAGING_DIR)/fakeroot.env
# Use fakeroot to pretend all target binaries are owned by root
- $(STAGING_DIR)/usr/bin/fakeroot -i $(STAGING_DIR)/fakeroot.env \
+ $(STAGING_DIR)/usr/bin/fakeroot \
+ -i $(STAGING_DIR)/fakeroot.env \
-s $(STAGING_DIR)/fakeroot.env -- \
- find $(TARGET_DIR) | xargs chown -R root:root
+ 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 \
+ $(STAGING_DIR)/usr/bin/fakeroot \
+ -i $(STAGING_DIR)/fakeroot.env \
-s $(STAGING_DIR)/fakeroot.env -- \
- $(STAGING_DIR)/bin/makedevs -r $(TARGET_DIR) \
- target/default/device_table.txt
- -@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
+ $(STAGING_DIR)/bin/makedevs \
+ -r $(TARGET_DIR) \
+ -d target/generic/device_table.txt
# Use fakeroot to fake out mksquashfs per the previous fakery
- $(STAGING_DIR)/usr/bin/fakeroot -i $(STAGING_DIR)/fakeroot.env -- \
+ $(STAGING_DIR)/usr/bin/fakeroot \
+ -i $(STAGING_DIR)/fakeroot.env \
+ -s $(STAGING_DIR)/fakeroot.env -- \
$(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) \
$(IMAGE).squashfs -noappend