diff -r 8d23dc29eb7d -r e815b1a5057c config/kernel/linux.in --- a/config/kernel/linux.in Mon Sep 15 12:08:01 2008 +0000 +++ b/config/kernel/linux.in Mon Sep 15 14:52:29 2008 +0000 @@ -4,39 +4,197 @@ bool prompt "Get kernel headers from:" -config KERNEL_LINUX_HEADERS_INSTALL +config KERNEL_LINUX_INSTALL bool prompt "kernel's 'headers_install'" help This will make use of the new headers_install rule in recent kernels. This is most probably what you want to use. -config KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR +if KERNEL_LINUX_INSTALL + +config KERNEL_LINUX_INSTALL_CHECK bool - prompt "Use custom directory" + prompt "Check installed headers" + default y help - If you have some kernel headers lying around, you can enter the path - below. + If you are in doubt that installed headers are buggy, say 'Y' + here to have an extra check passed onto the headers. +choice + bool + prompt "Linux kernel version" + +config KERNEL_V_2_6_18_8 + bool + prompt "2.6.18.8 (OBSOLETE)" + depends on OBSOLETE + +config KERNEL_V_2_6_19_7 + bool + prompt "2.6.19.7 (OBSOLETE)" + depends on OBSOLETE + +config KERNEL_V_2_6_20_21 + bool + prompt "2.6.20.21 (OBSOLETE)" + depends on OBSOLETE + +config KERNEL_V_2_6_21_7 + bool + prompt "2.6.21.7 (OBSOLETE)" + depends on OBSOLETE + +config KERNEL_V_2_6_22_19 + bool + prompt "2.6.22.19 (OBSOLETE)" + depends on OBSOLETE + +config KERNEL_V_2_6_23_17 + bool + prompt "2.6.23.17 (OBSOLETE)" + depends on OBSOLETE + +config KERNEL_V_2_6_24_7 + bool + prompt "2.6.24.7 (OBSOLETE)" + depends on OBSOLETE + +config KERNEL_V_2_6_25 + bool + prompt "2.6.25" + +config KERNEL_V_2_6_25_1 + bool + prompt "2.6.25.1" + +config KERNEL_V_2_6_25_2 + bool + prompt "2.6.25.2" + +config KERNEL_V_2_6_25_3 + bool + prompt "2.6.25.3" + +config KERNEL_V_2_6_25_4 + bool + prompt "2.6.25.4" + +config KERNEL_V_2_6_25_5 + bool + prompt "2.6.25.5" + +config KERNEL_V_2_6_25_6 + bool + prompt "2.6.25.6" + +config KERNEL_V_2_6_25_7 + bool + prompt "2.6.25.7" + +config KERNEL_V_2_6_25_8 + bool + prompt "2.6.25.8" + +config KERNEL_V_2_6_25_9 + bool + prompt "2.6.25.9" + +config KERNEL_V_2_6_25_10 + bool + prompt "2.6.25.10" + +config KERNEL_V_2_6_25_11 + bool + prompt "2.6.25.11" + +config KERNEL_V_2_6_25_12 + bool + prompt "2.6.25.12" + +config KERNEL_V_2_6_25_13 + bool + prompt "2.6.25.13" + +config KERNEL_V_2_6_25_14 + bool + prompt "2.6.25.14" + +config KERNEL_V_2_6_25_15 + bool + prompt "2.6.25.15" + +config KERNEL_V_2_6_25_16 + bool + prompt "2.6.25.16" + +config KERNEL_V_2_6_25_17 + bool + prompt "2.6.25.17" + +config KERNEL_V_2_6_26 + bool + prompt "2.6.26" + +config KERNEL_V_2_6_26_1 + bool + prompt "2.6.26.1" + +config KERNEL_V_2_6_26_2 + bool + prompt "2.6.26.2" + +config KERNEL_V_2_6_26_3 + bool + prompt "2.6.26.3" + +config KERNEL_V_2_6_26_4 + bool + prompt "2.6.26.4" + +config KERNEL_V_2_6_26_5 + bool + prompt "2.6.26.5" + +# CT_INSERT_VERSION_ABOVE +# Don't remove above line! endchoice -if KERNEL_LINUX_HEADERS_INSTALL - -config KERNEL_VERSION_SEE_EXTRAVERSION - bool - prompt "See extra versions" - default n - depends on KERNEL_LINUX_HEADERS_COPY || KERNEL_LINUX_HEADERS_INSTALL - help - See extra versions (kernel with 4 numbers, eg 2.6.19.1). - - If you say 'no', you'll only see sub-level, 3-digit versions. - If you say 'yes', you'll see far more versions! - - It is recommended that you say 'no', unless you _*know*_ - that an extra version fixes a headers bug. - -source config/kernel/linux_headers_install.in +config KERNEL_VERSION + string + default "2.6.18.8" if KERNEL_V_2_6_18_8 + default "2.6.19.7" if KERNEL_V_2_6_19_7 + default "2.6.20.21" if KERNEL_V_2_6_20_21 + default "2.6.21.7" if KERNEL_V_2_6_21_7 + default "2.6.22.19" if KERNEL_V_2_6_22_19 + default "2.6.23.17" if KERNEL_V_2_6_23_17 + default "2.6.24.7" if KERNEL_V_2_6_24_7 + default "2.6.25" if KERNEL_V_2_6_25 + default "2.6.25.1" if KERNEL_V_2_6_25_1 + default "2.6.25.2" if KERNEL_V_2_6_25_2 + default "2.6.25.3" if KERNEL_V_2_6_25_3 + default "2.6.25.4" if KERNEL_V_2_6_25_4 + default "2.6.25.5" if KERNEL_V_2_6_25_5 + default "2.6.25.6" if KERNEL_V_2_6_25_6 + default "2.6.25.7" if KERNEL_V_2_6_25_7 + default "2.6.25.8" if KERNEL_V_2_6_25_8 + default "2.6.25.9" if KERNEL_V_2_6_25_9 + default "2.6.25.10" if KERNEL_V_2_6_25_10 + default "2.6.25.11" if KERNEL_V_2_6_25_11 + default "2.6.25.12" if KERNEL_V_2_6_25_12 + default "2.6.25.13" if KERNEL_V_2_6_25_13 + default "2.6.25.14" if KERNEL_V_2_6_25_14 + default "2.6.25.14" if KERNEL_V_2_6_25_15 + default "2.6.25.15" if KERNEL_V_2_6_25_16 + default "2.6.25.15" if KERNEL_V_2_6_25_17 + default "2.6.26" if KERNEL_V_2_6_26 + default "2.6.26.1" if KERNEL_V_2_6_26_1 + default "2.6.26.2" if KERNEL_V_2_6_26_2 + default "2.6.26.3" if KERNEL_V_2_6_26_3 + default "2.6.26.4" if KERNEL_V_2_6_26_4 + default "2.6.26.5" if KERNEL_V_2_6_26_5 +# CT_INSERT_VERSION_STRING_ABOVE +# Don't remove above line! choice bool @@ -71,13 +229,22 @@ endif -config KERNEL_LINUX_HEADERS_CUSTOM_DIR +config KERNEL_LINUX_USE_CUSTOM_DIR + bool + prompt "Use custom directory" + help + If you have some kernel headers lying around, you can enter the path + below. + +config KERNEL_LINUX_CUSTOM_DIR string prompt "Where are those custom headers?" - depends on KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR + depends on KERNEL_LINUX_USE_CUSTOM_DIR help Enter the base directory where the headers are to be found. Eg. if the headers are in /some/place/include, then enter /some/place. This is the same path you entered when you typed: make INSTALL_HDR_PATH=/some/place headers_install + +endchoice