Commit 3b4a5f59 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

target: remove BR2_TARGET_ROOTFS_*_SQUASH options 

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

target/jffs2/Config.in

+0 −4
Original line number Diff line number Diff line
@@ -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

target/jffs2/jffs2root.mk

+0 −4
Original line number Diff line number Diff line
@@ -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

target/ubifs/Config.in

+0 −5
Original line number Diff line number Diff line
@@ -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

target/ubifs/ubifsroot.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)" \