target: remove BR2_TARGET_ROOTFS_*_SQUASH options

Everything besides ubifs does an unconditional chown -R 0:0 anyway.

diff --git a/target/jffs2/Config.in b/target/jffs2/Config.in
index 2a4c48cf7d85570c1ab50128602183ea586bd67c..d6a8f059b3effb479a81848bee8447793b6b1846 100644 (file)
--- 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 94c6c30390e0e58059f246d9e0620e097a364ba7..1e03bf04675196ab23a1ef02703342446cb9de28 100644 (file)
--- 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 85229f61ca6f77188d4607c0065a910287bde0c6..90ebfd9e4ff3f9904eb9ea149b8958ef3c5ec30c 100644 (file)
--- 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 cd330df0108edcc936f0fc8dc346f08832616aba..2f3e96505ed7130360996d6150c490a5e3a0bc84 100644 (file)
--- 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)" \