Commit 2f7a53ee authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Peter Korsgaard
Browse files

squashfs3: remove deprecated package/rootfs 



[Peter: remove now unused BR2_DEPRECATED_SINCE_2010_05 symbol]
Signed-off-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent ba4ad9d2

Config.in

+0 −4
Original line number Diff line number Diff line
@@ -256,10 +256,6 @@ config BR2_DEPRECATED 


if BR2_DEPRECATED



config BR2_DEPRECATED_SINCE_2010_05

	bool

	default y



config BR2_DEPRECATED_SINCE_2010_11

	bool

	default y

Config.in.legacy

+17 −0
Original line number Diff line number Diff line
@@ -101,6 +101,23 @@ endif 
###############################################################################

comment "Legacy options removed in 2014.02"



config BR2_PACKAGE_SQUASHFS3

	bool "squashfs3 has been removed"

	select BR2_LEGACY

	select BR2_PACKAGE_SQUASHFS

	help

	  The 'squashfs3' package has been removed since it has been

	  deprecated for more than four buildroot releases. Package

	  'squashfs' (4) has been selected automatically as replacement.



config BR2_TARGET_ROOTFS_SQUASHFS3

	bool "squashfs3 rootfs support has been removed"

	select BR2_LEGACY

	help

	  Together with the removal of the squashfs3 package, support

	  for squashfs3 root filesystems has been removed too. Squashfs

	  root filesystems will automatically use squashfs4 now.



config BR2_PACKAGE_NETKITBASE

	bool "netkitbase has been removed"

	select BR2_LEGACY

fs/squashfs/Config.in

+0 −16
Original line number Diff line number Diff line
@@ -4,26 +4,10 @@ config BR2_TARGET_ROOTFS_SQUASHFS 
	  Build a squashfs root filesystem



if BR2_TARGET_ROOTFS_SQUASHFS

choice

	prompt "SquashFS version"

	default BR2_TARGET_ROOTFS_SQUASHFS4

	help

	  Select the Squash filesystem version to use to generate the

	  root filesystem.



config BR2_TARGET_ROOTFS_SQUASHFS4

	bool "4.x"



config BR2_TARGET_ROOTFS_SQUASHFS3

	depends on BR2_DEPRECATED_SINCE_2010_05

	bool "3.x"



endchoice



choice

	prompt "Compression algorithm"

	default BR2_TARGET_ROOTFS_SQUASHFS4_GZIP

	depends on BR2_TARGET_ROOTFS_SQUASHFS4

	help

	  Select the squashfs compression algorithm to use when

	  generating the filesystem.

fs/squashfs/squashfs.mk

+0 −12
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#

################################################################################



ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4),y)

ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs



ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
@@ -21,17 +20,6 @@ endif 
endif

endif



else

ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3



ifeq ($(BR2_ENDIAN),"BIG")

ROOTFS_SQUASHFS_ARGS=-be

else

ROOTFS_SQUASHFS_ARGS=-le

endif



endif



define ROOTFS_SQUASHFS_CMD

	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \

		$(ROOTFS_SQUASHFS_ARGS) && \

package/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ source "package/mtd/Config.in" 
source "package/nfs-utils/Config.in"

source "package/ntfs-3g/Config.in"

source "package/squashfs/Config.in"

source "package/squashfs3/Config.in"

source "package/sshfs/Config.in"

source "package/sunxi-tools/Config.in"

source "package/unionfs/Config.in"