Commit 3169aae8 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

busybox: add 1.17.0, convert to gentargets, drop 1.12, deprecate 1.13 and 1.15 



Closes #2167

[Peter: fix CONFIG_ID workaround for old uClibcs]
Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a7c24b63

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
	#2143: buildroot compiler generates segfaulting statically linked exe..

	#2155: Compression lzo don't set for ubifs

	#2166: [SECURITY] Update libpng to 1.2.44

	#2167: Bump busybox to 1.17.0, convert to gentargets, drop 1.12, ...



2010.05, Released May 30th, 2010:

package/busybox/Config.in

+7 −7
Original line number Diff line number Diff line
@@ -17,12 +17,9 @@ choice 
	help

	  Select the version of BusyBox you wish to use.



	config BR2_BUSYBOX_VERSION_1_12_X

		bool "BusyBox 1.12.x"

		depends on BR2_DEPRECATED



	config BR2_BUSYBOX_VERSION_1_13_X

		bool "BusyBox 1.13.x"

		depends on BR2_DEPRECATED



	config BR2_BUSYBOX_VERSION_1_14_X

		bool "BusyBox 1.14.x"
@@ -34,6 +31,9 @@ choice 
	config BR2_BUSYBOX_VERSION_1_16_X

		bool "BusyBox 1.16.x"



	config BR2_BUSYBOX_VERSION_1_17_X

		bool "BusyBox 1.17.x"



	config BR2_PACKAGE_BUSYBOX_SNAPSHOT

		bool "daily snapshot"
@@ -41,11 +41,11 @@ endchoice 


config BR2_BUSYBOX_VERSION

	string

	default "1.12.4"	if BR2_BUSYBOX_VERSION_1_12_X

	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X

	default "1.14.4"	if BR2_BUSYBOX_VERSION_1_14_X

	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X

	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X

	default "1.17.0"	if BR2_BUSYBOX_VERSION_1_17_X



config BR2_PACKAGE_BUSYBOX_FULLINSTALL

	bool "Run BusyBox's own full installation"
@@ -61,12 +61,12 @@ config BR2_PACKAGE_BUSYBOX_FULLINSTALL 


config BR2_PACKAGE_BUSYBOX_CONFIG

	string "BusyBox configuration file to use?"

	default "package/busybox/busybox-1.16.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT

	default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X

	default "package/busybox/busybox-1.17.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT

	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_13_X

	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_14_X

	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_15_X

	default "package/busybox/busybox-1.16.x.config" if BR2_BUSYBOX_VERSION_1_16_X

	default "package/busybox/busybox-1.17.x.config" if BR2_BUSYBOX_VERSION_1_17_X

	help

	  Some people may wish to use their own modified BusyBox configuration

	  file, and will specify their config file location with this option.

package/busybox/busybox-1.11.x.config→package/busybox/busybox-1.17.x.config

+234 −119

File changed and moved.

Preview size limit exceeded, changes collapsed.

package/busybox/busybox.mk

+130 −104

File changed.

Preview size limit exceeded, changes collapsed.