From 51f3f96498c9cda3386a4bcbaf8e1e4cd107035f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 3 Dec 2010 16:51:49 -0300 Subject: busybox: add 1.18.0, remove 1.13.x and 1.14.x, mark 1.15.x as deprecated Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/busybox/Config.in | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'package/busybox/Config.in') diff --git a/package/busybox/Config.in b/package/busybox/Config.in index e53046e58..48ba1c8b9 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -17,16 +17,9 @@ choice help Select the version of BusyBox you wish to use. - 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" - depends on BR2_DEPRECATED - config BR2_BUSYBOX_VERSION_1_15_X bool "BusyBox 1.15.x" + depends on BR2_DEPRECATED config BR2_BUSYBOX_VERSION_1_16_X bool "BusyBox 1.16.x" @@ -34,6 +27,9 @@ choice config BR2_BUSYBOX_VERSION_1_17_X bool "BusyBox 1.17.x" + config BR2_BUSYBOX_VERSION_1_18_X + bool "BusyBox 1.18.x" + config BR2_PACKAGE_BUSYBOX_SNAPSHOT bool "daily snapshot" @@ -41,11 +37,10 @@ endchoice config BR2_BUSYBOX_VERSION string - 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.4" if BR2_BUSYBOX_VERSION_1_17_X + default "1.18.0" if BR2_BUSYBOX_VERSION_1_18_X config BR2_PACKAGE_BUSYBOX_FULLINSTALL bool "Run BusyBox's own full installation" @@ -61,12 +56,11 @@ config BR2_PACKAGE_BUSYBOX_FULLINSTALL config BR2_PACKAGE_BUSYBOX_CONFIG string "BusyBox configuration file to use?" - 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.18.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT 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 + default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X help Some people may wish to use their own modified BusyBox configuration file, and will specify their config file location with this option. -- cgit v1.2.3