diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-04-07 19:22:37 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-04-07 19:22:37 +0000 |
| commit | 3b4a5f59e1cb0d664b9998eaadf7d9e706d4c350 (patch) | |
| tree | 8264523a63f70ac117269d691df5402656e6e98e | |
| parent | 5b8c84e717fdc8fcb4217e6f1818fc230b2bb209 (diff) | |
target: remove BR2_TARGET_ROOTFS_*_SQUASH options
Everything besides ubifs does an unconditional chown -R 0:0 anyway.
| -rw-r--r-- | target/jffs2/Config.in | 4 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 4 | ||||
| -rw-r--r-- | target/ubifs/Config.in | 5 | ||||
| -rw-r--r-- | target/ubifs/ubifsroot.mk | 2 |
4 files changed, 0 insertions, 15 deletions
diff --git a/target/jffs2/Config.in b/target/jffs2/Config.in index 2a4c48cf7..d6a8f059b 100644 --- a/target/jffs2/Config.in +++ b/target/jffs2/Config.in @@ -113,10 +113,6 @@ config BR2_TARGET_ROOTFS_JFFS2_BE endchoice -config BR2_TARGET_ROOTFS_JFFS2_SQUASH - bool "Make all files be owned by root" - depends on BR2_TARGET_ROOTFS_JFFS2 - config BR2_TARGET_ROOTFS_JFFS2_SUMMARY bool "Produce a summarized JFFS2 image" depends on BR2_TARGET_ROOTFS_JFFS2 diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 94c6c3039..1e03bf046 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -16,10 +16,6 @@ endif SUMTOOL_OPTS += -p endif -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_SQUASH),y) -JFFS2_OPTS += -q -endif - ifeq ($(BR2_TARGET_ROOTFS_JFFS2_LE),y) JFFS2_OPTS += -l SUMTOOL_OPTS += -l diff --git a/target/ubifs/Config.in b/target/ubifs/Config.in index 85229f61c..90ebfd9e4 100644 --- a/target/ubifs/Config.in +++ b/target/ubifs/Config.in @@ -23,11 +23,6 @@ config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT help Some comment required here -config BR2_TARGET_ROOTFS_UBIFS_SQUASH - bool "Make all files be owned by root" - depends on BR2_TARGET_ROOTFS_UBIFS - default y - config BR2_TARGET_ROOTFS_UBIFS_OUTPUT string "Output File" depends on BR2_TARGET_ROOTFS_UBIFS diff --git a/target/ubifs/ubifsroot.mk b/target/ubifs/ubifsroot.mk index cd330df01..2f3e96505 100644 --- a/target/ubifs/ubifsroot.mk +++ b/target/ubifs/ubifsroot.mk @@ -93,9 +93,7 @@ endif rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) -ifneq ($(BR2_TARGET_ROOTFS_UBIFS_SQUASH),) echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) -endif ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ |