summaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/kernel-headers/Config.in8
-rw-r--r--toolchain/kernel-headers/linux-2.6.31.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch (renamed from toolchain/kernel-headers/linux-2.6.31.9-scsi-use-__uX-types-for-headers-exported-to-user-space.patch)0
-rw-r--r--toolchain/kernel-headers/linux-2.6.32.3-scsi-use-__uX-types-for-headers-exported-to-user-space.patch (renamed from toolchain/kernel-headers/linux-2.6.32.2-scsi-use-__uX-types-for-headers-exported-to-user-space.patch)0
-rw-r--r--toolchain/uClibc/Config.in10
4 files changed, 12 insertions, 6 deletions
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 5e07e7d7d..c94f25c07 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
choice
prompt "Kernel Headers"
- default BR2_KERNEL_HEADERS_2_6_31
+ default BR2_KERNEL_HEADERS_2_6_32
help
Select the version of kernel header files you wish to use.
@@ -66,11 +66,11 @@ config BR2_DEFAULT_KERNEL_VERSION
config BR2_DEFAULT_KERNEL_HEADERS
string
default "2.6.26.8" if BR2_KERNEL_HEADERS_2_6_26
- default "2.6.27.42" if BR2_KERNEL_HEADERS_2_6_27
+ default "2.6.27.43" if BR2_KERNEL_HEADERS_2_6_27
default "2.6.28.10" if BR2_KERNEL_HEADERS_2_6_28
default "2.6.29.6" if BR2_KERNEL_HEADERS_2_6_29
default "2.6.30.10" if BR2_KERNEL_HEADERS_2_6_30
- default "2.6.31.9" if BR2_KERNEL_HEADERS_2_6_31
- default "2.6.32.2" if BR2_KERNEL_HEADERS_2_6_32
+ default "2.6.31.11" if BR2_KERNEL_HEADERS_2_6_31
+ default "2.6.32.3" if BR2_KERNEL_HEADERS_2_6_32
default "2.6" if BR2_KERNEL_HEADERS_SNAP
default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-2.6.31.9-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.31.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
index ac9875dd7..ac9875dd7 100644
--- a/toolchain/kernel-headers/linux-2.6.31.9-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
+++ b/toolchain/kernel-headers/linux-2.6.31.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
diff --git a/toolchain/kernel-headers/linux-2.6.32.2-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.32.3-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
index ac9875dd7..ac9875dd7 100644
--- a/toolchain/kernel-headers/linux-2.6.32.2-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
+++ b/toolchain/kernel-headers/linux-2.6.32.3-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 16708a6cb..0d41de159 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -5,7 +5,7 @@ comment "uClibc Options"
choice
prompt "uClibc C library Version"
- default BR2_UCLIBC_VERSION_0_9_30_1
+ default BR2_UCLIBC_VERSION_0_9_30_2
help
Select the version of uClibc you wish to use.
@@ -20,12 +20,16 @@ choice
bool "uClibc 0.9.29"
config BR2_UCLIBC_VERSION_0_9_30
- depends on BR2_RECENT || BR2_DEPRECATED
+ depends on BR2_DEPRECATED
bool "uClibc 0.9.30"
config BR2_UCLIBC_VERSION_0_9_30_1
+ depends on BR2_RECENT || BR2_DEPRECATED
bool "uClibc 0.9.30.1"
+ config BR2_UCLIBC_VERSION_0_9_30_2
+ bool "uClibc 0.9.30.2"
+
config BR2_UCLIBC_VERSION_SNAPSHOT
bool "daily snapshot"
@@ -44,6 +48,7 @@ config BR2_UCLIBC_VERSION_STRING
default 0.9.29 if BR2_UCLIBC_VERSION_0_9_29
default 0.9.30 if BR2_UCLIBC_VERSION_0_9_30
default 0.9.30.1 if BR2_UCLIBC_VERSION_0_9_30_1
+ default 0.9.30.2 if BR2_UCLIBC_VERSION_0_9_30_2
default $BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT
config BR2_UCLIBC_CONFIG
@@ -52,6 +57,7 @@ config BR2_UCLIBC_CONFIG
default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_0_9_29
default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30
default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30_1
+ default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30_2
default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
help
Some people may wish to use their own modified uClibc configuration