From 3169aae85ef4b26aec667376b0559b38582ccf52 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Jul 2010 14:20:06 -0300 Subject: 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: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/busybox/Config.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/busybox/Config.in') diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 9e957e122..dd13b3fa7 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -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. -- cgit v1.2.3