Преглед изворни кода

lzma: remove deprecated target package

The on-target lzma package has been deprecated for a long time, so remove
it. This does not remove the support for generating lzma-compressed rootfs
images.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas De Schampheleire пре 11 година
родитељ
комит
0a07731933
5 измењених фајлова са 8 додато и 20 уклоњено
  1. 0 4
      Config.in
  2. 8 0
      Config.in.legacy
  3. 0 1
      package/Config.in
  4. 0 13
      package/lzma/Config.in
  5. 0 2
      package/lzma/lzma.mk

+ 0 - 4
Config.in

@@ -264,10 +264,6 @@ config BR2_DEPRECATED
 
 if BR2_DEPRECATED
 
-config BR2_DEPRECATED_SINCE_2010_11
-	bool
-	default y
-
 config BR2_DEPRECATED_SINCE_2012_11
 	bool
 	default y

+ 8 - 0
Config.in.legacy

@@ -101,6 +101,14 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2014.02"
 
+config BR2_PACKAGE_LZMA
+	bool "lzma target package has been removed"
+	select BR2_LEGACY
+	help
+	  The 'lzma' target package has been removed since it has been
+	  deprecated for more than four buildroot releases.
+	  Note: generating lzma-compressed rootfs images is still supported.
+
 config BR2_PACKAGE_TTCP
 	bool "ttcp has been removed"
 	select BR2_LEGACY

+ 0 - 1
package/Config.in

@@ -35,7 +35,6 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gzip/Config.in"
 endif
 source "package/infozip/Config.in"
-source "package/lzma/Config.in"
 source "package/lzop/Config.in"
 source "package/xz/Config.in"
 endmenu

+ 0 - 13
package/lzma/Config.in

@@ -1,13 +0,0 @@
-config BR2_PACKAGE_LZMA
-	bool "lzma"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_DEPRECATED_SINCE_2010_11
-	help
-	  Lempel Ziv compression method (LZMA) is a compression
-	  algorithm with high compression ratio.
-
-	  http://tukaani.org/lzma/
-
-comment "lzma needs a toolchain w/ C++"
-	depends on BR2_DEPRECATED_SINCE_2010_11
-	depends on !BR2_INSTALL_LIBSTDCPP

+ 0 - 2
package/lzma/lzma.mk

@@ -7,10 +7,8 @@
 LZMA_VERSION = 4.32.7
 LZMA_SOURCE = lzma-$(LZMA_VERSION).tar.xz
 LZMA_SITE = http://tukaani.org/lzma/
-LZMA_INSTALL_STAGING = YES
 LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
-$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 LZMA = $(HOST_DIR)/usr/bin/lzma