aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas De Schampheleire <patrickdepinguin@gmail.com>2014-01-21 08:54:12 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-01-21 21:58:07 +0100
commit0a07731933bded233b840e71770c01118b3a709c (patch)
treedb9fa4e6cbc869a74ca0a32c0e546fcba83b2084
parent08506501b0bab41dad7f07bc0cbf10ed90eb645e (diff)
downloadbuildroot-0a07731933bded233b840e71770c01118b3a709c.tar.gz
buildroot-0a07731933bded233b840e71770c01118b3a709c.tar.bz2
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>
-rw-r--r--Config.in4
-rw-r--r--Config.in.legacy8
-rw-r--r--package/Config.in1
-rw-r--r--package/lzma/Config.in13
-rw-r--r--package/lzma/lzma.mk2
5 files changed, 8 insertions, 20 deletions
diff --git a/Config.in b/Config.in
index fa723fe0a0..7ec7c2ab48 100644
--- a/Config.in
+++ b/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
diff --git a/Config.in.legacy b/Config.in.legacy
index 473d0efee2..631286ae97 100644
--- a/Config.in.legacy
+++ b/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
diff --git a/package/Config.in b/package/Config.in
index ed31354205..c45f8bd166 100644
--- a/package/Config.in
+++ b/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
diff --git a/package/lzma/Config.in b/package/lzma/Config.in
deleted file mode 100644
index d7e8827989..0000000000
--- a/package/lzma/Config.in
+++ /dev/null
@@ -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
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index 90498334df..e7129dd518 100644
--- a/package/lzma/lzma.mk
+++ b/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