From 02bc426214a0705293f9c86fcd5fc47387d4f503 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 10 Apr 2010 22:52:38 +0200 Subject: [PATCH] Get rid of all usages of BR2_RECENT Since BR2_RECENT was enabled by default, we do not want entries marked BR2_RECENT (and thus appearing by default in Buildroot) to disappear. Therefore, all the entries marked BR2_RECENT are converted as non-deprecated. We can later decide, on a per-entry basis, to add BR2_DEPRECATED to some of them. But at least, this commit doesn't change the default current behaviour of Buildroot. Signed-off-by: Thomas Petazzoni --- package/busybox/Config.in | 2 -- target/u-boot/Config.in | 2 -- toolchain/binutils/Config.in | 1 - toolchain/gcc/Config.in | 2 -- toolchain/kernel-headers/Config.in | 1 - toolchain/uClibc/Config.in | 1 - 6 files changed, 9 deletions(-) diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 7110f0f568..68abf16f56 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -23,7 +23,6 @@ choice config BR2_BUSYBOX_VERSION_1_13_X bool "BusyBox 1.13.x" - depends on BR2_RECENT config BR2_BUSYBOX_VERSION_1_14_X bool "BusyBox 1.14.x" @@ -31,7 +30,6 @@ choice config BR2_BUSYBOX_VERSION_1_15_X bool "BusyBox 1.15.x" - depends on BR2_DEPRECATED || BR2_RECENT config BR2_BUSYBOX_VERSION_1_16_X bool "BusyBox 1.16.x" diff --git a/target/u-boot/Config.in b/target/u-boot/Config.in index f84d181e60..ca47e18f95 100644 --- a/target/u-boot/Config.in +++ b/target/u-boot/Config.in @@ -22,11 +22,9 @@ config BR2_TARGET_UBOOT_2010_03 config BR2_TARGET_UBOOT_2009_11 bool "u-boot-2009.11" - depends on BR2_DEPRECATED || BR2_RECENT config BR2_TARGET_UBOOT_2009_08 bool "u-boot-2009.08" - depends on BR2_DEPRECATED || BR2_RECENT config BR2_TARGET_UBOOT_2009_06 bool "u-boot-2009.06" diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index 003d0ee0d9..165b43efc6 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -34,7 +34,6 @@ choice config BR2_BINUTILS_VERSION_2_20 depends on !BR2_avr32 - depends on BR2_DEPRECATED || BR2_RECENT bool "binutils 2.20" config BR2_BINUTILS_VERSION_2_20_1 diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 97d5eb7789..73edd3879a 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -35,7 +35,6 @@ choice config BR2_GCC_VERSION_4_2_4 depends on !BR2_avr32 - depends on BR2_RECENT || BR2_DEPRECATED bool "gcc 4.2.4" config BR2_GCC_VERSION_4_3_2 @@ -45,7 +44,6 @@ choice config BR2_GCC_VERSION_4_3_3 depends on !BR2_avr32 - depends on BR2_RECENT || BR2_DEPRECATED bool "gcc 4.3.3" config BR2_GCC_VERSION_4_3_4 diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 8f7f720cfb..3f2d43577e 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -38,7 +38,6 @@ choice config BR2_KERNEL_HEADERS_2_6_32 bool "Linux 2.6.32.x kernel headers" - depends on BR2_DEPRECATED || BR2_RECENT config BR2_KERNEL_HEADERS_2_6_33 bool "Linux 2.6.33.x kernel headers" diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index e254f28400..f29ec6409d 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -20,7 +20,6 @@ choice bool "uClibc 0.9.29" config BR2_UCLIBC_VERSION_0_9_30 - depends on BR2_DEPRECATED || BR2_RECENT bool "uClibc 0.9.30.x" config BR2_UCLIBC_VERSION_0_9_31 -- 2.30.2