Deprecation: clarify manual, remove ttcp and lzma
PATCH v2 1/1 Deprecation: clarify manual, remove ttcp and lzma
---
Config.in | 8 ---- Config.in.legacy | 29 ++++++++++---- docs/manual/appendix.txt | 8 +++- package/Config.in | 2 - package/flex/Config.in | 2 +- package/lzma/Config.in | 13 ------ package/lzma/lzma.mk | 2 - package/ttcp/Config.in | 7 --- package/ttcp/ttcp-0001-replace-deprecated-bcopy.patch | 15 ------- package/ttcp/ttcp.mk | 25 ------------ 10 files changed, 29 insertions(+), 82 deletions(-)
PATCH v2 1/1 manual: clarify handling of deprecated features
---
v2: resend
docs/manual/appendix.txt | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
docs/manual/appendix.txt +7 -1
@@ -29,6 +29,12 @@ Deprecated features ------------------- The following features are marked as _deprecated_ in Buildroot due to -their status either too old or unmaintained. +them being either too old or unmaintained. They will be removed at +some point, so stop using them. +Each deprecated symbol in kconfig depends on a symbol ++BR2_DEPRECATED_SINCE_xxxx_xx+, which provides an indication of when +the feature can be removed: features will not be removed within the +year following deprecation. For example, a symbol depending on ++BR2_DEPRECATED_SINCE_2013_05+ can be removed from 2014.05 onwards. include::deprecated-list.txt[]
PATCH v2 1/1 ttcp: remove deprecated package
In reply to Thomas De SchampheleireSince this is the only package depending on BR2_DEPRECATED_SINCE_2012_05, remove that symbol as well.
---
v2: also remove deprecation symbol.
Config.in | 4 -- Config.in.legacy | 7 ++++ package/Config.in | 1 - package/ttcp/Config.in | 7 ---- package/ttcp/ttcp-0001-replace-deprecated-bcopy.patch | 15 --------- package/ttcp/ttcp.mk | 25 --------------- 6 files changed, 7 insertions(+), 52 deletions(-)
Config.in +0 -4
@@ -268,10 +268,6 @@ config BR2_DEPRECATED_SINCE_2010_11 bool default y -config BR2_DEPRECATED_SINCE_2012_05 - bool - default y - config BR2_DEPRECATED_SINCE_2012_11 bool default y
Config.in.legacy +7 -0
@@ -112,6 +112,13 @@ config BR2_PACKAGE_LIBNFC_LLCP ############################################################################### comment "Legacy options removed in 2014.02" +config BR2_PACKAGE_TTCP + bool "ttcp has been removed" + select BR2_LEGACY + help + The 'ttcp' package has been removed since it has been + deprecated for more than four buildroot releases. + config BR2_PACKAGE_SQUASHFS3 bool "squashfs3 has been removed" select BR2_LEGACY
package/Config.in +0 -1
@@ -931,7 +931,6 @@ source "package/thttpd/Config.in" source "package/tinyhttpd/Config.in" source "package/tn5250/Config.in" source "package/transmission/Config.in" -source "package/ttcp/Config.in" source "package/tvheadend/Config.in" source "package/udpcast/Config.in" source "package/ulogd/Config.in"
package/ttcp/Config.in deleted +0 -7
@@ -1,7 +0,0 @@ -config BR2_PACKAGE_TTCP - bool "ttcp" - depends on BR2_DEPRECATED_SINCE_2012_05 - help - Benchmarking tool for determining TCP and UDP performance. - - ftp://ftp.sgi.com/sgi/src/ttcp/README
package/ttcp/ttcp-0001-replace-deprecated-bcopy.patch deleted +0 -15
@@ -1,15 +0,0 @@ -Replace deprecated bcopy call by using memmove instead. - -Index: b/ttcp.c -=================================================================== ---- a/ttcp.c -+++ b/ttcp.c -@@ -241,7 +241,7 @@ - if ((addr=gethostbyname(host)) == NULL) - err("bad hostname"); - sinhim.sin_family = addr->h_addrtype; -- bcopy(addr->h_addr,(char*)&addr_tmp, addr->h_length); -+ memmove((char*)&addr_tmp, addr->h_addr, addr->h_length); - #if defined(cray) - sinhim.sin_addr = addr_tmp; - #else
package/ttcp/ttcp.mk deleted +0 -25
@@ -1,25 +0,0 @@ -################################################################################ -# -# ttcp -# -################################################################################ - -TTCP_VERSION = 1.12 -TTCP_SITE = ftp://ftp.sgi.com/sgi/src/ttcp/ -TTCP_SOURCE = ttcp.c -TTCP_LICENSE = public domain - -define TTCP_EXTRACT_CMDS - cp -f -t $(@D) $(DL_DIR)/$(TTCP_SOURCE) -endef - -define TTCP_BUILD_CMDS - $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) \ - -o $(@D)/ttcp $(@D)/$(TTCP_SOURCE) -endef - -define TTCP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/ttcp $(TARGET_DIR)/usr/bin/ttcp -endef - -$(eval $(generic-package))
PATCH v2 1/1 flex: change config text of 'target binary' option
In reply to Thomas De SchampheleireThe buildroot manual contains a list of deprecated items, with their config title text, and the location in the config menu. If the config text does not mention a package name, this can be confusing.
For example, the symbol BR2_PACKAGE_FLEX_BINARY has as text:
'Install tool in the target', which outside of the flex context makes no sense at all.
To make sure the deprecated packages list in the manual is understandable, rename the (deprecated) flex 'target binary' config option.
---
v2: new patch based on feedback from Arnout Vandecappelle
package/flex/Config.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/flex/Config.in +1 -1
@@ -10,7 +10,7 @@ config BR2_PACKAGE_FLEX if BR2_PACKAGE_FLEX config BR2_PACKAGE_FLEX_BINARY - bool "Install tool in the target" + bool "Install flex binary on target" # needs fork() depends on BR2_USE_MMU # runtime dependency
PATCH v2 1/1 lzma: remove deprecated target package
In reply to Thomas De SchampheleireThe 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.
---
v2: new patch
Config.in | 4 ---- Config.in.legacy | 13 ++++++++++--- package/Config.in | 1 - package/lzma/Config.in | 13 ------------- package/lzma/lzma.mk | 2 -- 5 files changed, 10 insertions(+), 23 deletions(-)
Config.in +0 -4
@@ -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
Config.in.legacy +10 -3
@@ -99,6 +99,16 @@ comment "------------------------------- 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_LIBNFC_LLCP bool "libnfc-llcp has been removed" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
@@ -109,9 +119,6 @@ config BR2_PACKAGE_LIBNFC_LLCP to 'libllcp'. We have added a new package for 'libllcp' and bumped the version at the same time. -############################################################################### -comment "Legacy options removed in 2014.02" - config BR2_PACKAGE_TTCP bool "ttcp has been removed" select BR2_LEGACY
package/Config.in +0 -1
@@ -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
package/lzma/Config.in deleted +0 -13
@@ -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
package/lzma/lzma.mk +0 -2
@@ -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
PATCH v2 1/1 lzma: remove deprecated target package
Thomas, All,
On 2014-01-20 22:46 +0100, Thomas De Schampheleire spake thusly:
Quoted 5 lines
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 <[email protected]>
[--SNIP--]
Quoted 21 lines
Config.in.legacy +10
-0@@ -99,6 +99,16 @@ comment "------------------------------- 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_LIBNFC_LLCP bool "libnfc-llcp has been removed" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
Config.in.legacy config BR2_PACKAGE_LIBNFC_LLCP · line 114
Quoted 6 lines
Config.in.legacy +0
-3@@ -109,9 +119,6 @@ config BR2_PACKAGE_LIBNFC_LLCP to 'libllcp'. We have added a new package for 'libllcp' and bumped the version at the same time. -############################################################################### -comment "Legacy options removed in 2014.02" -
Moving the comment will gonna clash with my recent patch being applied by Peter:
http://git.buildroot.org/buildroot/commit/?id=f169e5e1055600fda1b3ff0c852ee84d2ec80460
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/1 lzma: remove deprecated target package
On Mon, Jan 20, 2014 at 10:58 PM, Yann E. MORIN <[email protected]> wrote:
[..]
Quoted 6 lines
Quoted 1 line
-
Moving the comment will gonna clash with my recent patch being applied by Peter:
http://git.buildroot.org/buildroot/commit/?id=f169e5e1055600fda1b3ff0c852ee84d2ec80460
Grumbl... ;-)
Rebased with v3, thanks.
Best regards,
Thomas
PATCH v2 1/1 Config.in.legacy: fix misc. problems with libnfc-llcp removal
In reply to Thomas De SchampheleireThe Config.in.legacy entry associated with the replacement of libnfc-llcp was broken in multiple ways:
- it was not correctly added within the section for 2014.02 deprecation (incidentally fixed with the patch removing target lzma)
- it still had select/depend statement from the original symbol, which should not be added in Config.in.legacy.
- it did not select the replacement symbol as to make the transition for users more convenient.
- indentation of the help text was not tab+2spaces.
---
v2: new patch
Config.in.legacy | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
Config.in.legacy +4 -5
@@ -110,14 +110,13 @@ config BR2_PACKAGE_LZMA Note: generating lzma-compressed rootfs images is still supported. config BR2_PACKAGE_LIBNFC_LLCP - bool "libnfc-llcp has been removed" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBNFC + bool "libnfc-llcp has been replaced by libllcp" select BR2_LEGACY + select BR2_PACKAGE_LIBLLCP help The 'libnfc-llcp' package has been removed since upstream renamed - to 'libllcp'. We have added a new package for 'libllcp' and bumped - the version at the same time. + to 'libllcp'. We have added a new package for 'libllcp' and bumped + the version at the same time. config BR2_PACKAGE_TTCP bool "ttcp has been removed"