Move all the Linux kernel config options to a single file (to ease supporting more than one kernel).
Rename some Linux kernel config options (ditto).
Update the addToolsVersion.sh script.
/trunk/scripts/build/kernel/linux.sh | 13 6 7 0 +--
/trunk/tools/addToolVersion.sh | 105 37 68 0 +++++++--------------
/trunk/config/kernel/linux.in | 211 189 22 0 ++++++++++++++++++++++++++++++++++++++----
3 files changed, 232 insertions(+), 97 deletions(-)
1.1 --- a/config/kernel/linux.in Mon Sep 15 14:41:09 2008 +0000
1.2 +++ b/config/kernel/linux.in Mon Sep 15 14:52:29 2008 +0000
1.3 @@ -4,39 +4,197 @@
1.4 bool
1.5 prompt "Get kernel headers from:"
1.6
1.7 -config KERNEL_LINUX_HEADERS_INSTALL
1.8 +config KERNEL_LINUX_INSTALL
1.9 bool
1.10 prompt "kernel's 'headers_install'"
1.11 help
1.12 This will make use of the new headers_install rule in recent kernels.
1.13 This is most probably what you want to use.
1.14
1.15 -config KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR
1.16 +if KERNEL_LINUX_INSTALL
1.17 +
1.18 +config KERNEL_LINUX_INSTALL_CHECK
1.19 bool
1.20 - prompt "Use custom directory"
1.21 + prompt "Check installed headers"
1.22 + default y
1.23 help
1.24 - If you have some kernel headers lying around, you can enter the path
1.25 - below.
1.26 + If you are in doubt that installed headers are buggy, say 'Y'
1.27 + here to have an extra check passed onto the headers.
1.28
1.29 +choice
1.30 + bool
1.31 + prompt "Linux kernel version"
1.32 +
1.33 +config KERNEL_V_2_6_18_8
1.34 + bool
1.35 + prompt "2.6.18.8 (OBSOLETE)"
1.36 + depends on OBSOLETE
1.37 +
1.38 +config KERNEL_V_2_6_19_7
1.39 + bool
1.40 + prompt "2.6.19.7 (OBSOLETE)"
1.41 + depends on OBSOLETE
1.42 +
1.43 +config KERNEL_V_2_6_20_21
1.44 + bool
1.45 + prompt "2.6.20.21 (OBSOLETE)"
1.46 + depends on OBSOLETE
1.47 +
1.48 +config KERNEL_V_2_6_21_7
1.49 + bool
1.50 + prompt "2.6.21.7 (OBSOLETE)"
1.51 + depends on OBSOLETE
1.52 +
1.53 +config KERNEL_V_2_6_22_19
1.54 + bool
1.55 + prompt "2.6.22.19 (OBSOLETE)"
1.56 + depends on OBSOLETE
1.57 +
1.58 +config KERNEL_V_2_6_23_17
1.59 + bool
1.60 + prompt "2.6.23.17 (OBSOLETE)"
1.61 + depends on OBSOLETE
1.62 +
1.63 +config KERNEL_V_2_6_24_7
1.64 + bool
1.65 + prompt "2.6.24.7 (OBSOLETE)"
1.66 + depends on OBSOLETE
1.67 +
1.68 +config KERNEL_V_2_6_25
1.69 + bool
1.70 + prompt "2.6.25"
1.71 +
1.72 +config KERNEL_V_2_6_25_1
1.73 + bool
1.74 + prompt "2.6.25.1"
1.75 +
1.76 +config KERNEL_V_2_6_25_2
1.77 + bool
1.78 + prompt "2.6.25.2"
1.79 +
1.80 +config KERNEL_V_2_6_25_3
1.81 + bool
1.82 + prompt "2.6.25.3"
1.83 +
1.84 +config KERNEL_V_2_6_25_4
1.85 + bool
1.86 + prompt "2.6.25.4"
1.87 +
1.88 +config KERNEL_V_2_6_25_5
1.89 + bool
1.90 + prompt "2.6.25.5"
1.91 +
1.92 +config KERNEL_V_2_6_25_6
1.93 + bool
1.94 + prompt "2.6.25.6"
1.95 +
1.96 +config KERNEL_V_2_6_25_7
1.97 + bool
1.98 + prompt "2.6.25.7"
1.99 +
1.100 +config KERNEL_V_2_6_25_8
1.101 + bool
1.102 + prompt "2.6.25.8"
1.103 +
1.104 +config KERNEL_V_2_6_25_9
1.105 + bool
1.106 + prompt "2.6.25.9"
1.107 +
1.108 +config KERNEL_V_2_6_25_10
1.109 + bool
1.110 + prompt "2.6.25.10"
1.111 +
1.112 +config KERNEL_V_2_6_25_11
1.113 + bool
1.114 + prompt "2.6.25.11"
1.115 +
1.116 +config KERNEL_V_2_6_25_12
1.117 + bool
1.118 + prompt "2.6.25.12"
1.119 +
1.120 +config KERNEL_V_2_6_25_13
1.121 + bool
1.122 + prompt "2.6.25.13"
1.123 +
1.124 +config KERNEL_V_2_6_25_14
1.125 + bool
1.126 + prompt "2.6.25.14"
1.127 +
1.128 +config KERNEL_V_2_6_25_15
1.129 + bool
1.130 + prompt "2.6.25.15"
1.131 +
1.132 +config KERNEL_V_2_6_25_16
1.133 + bool
1.134 + prompt "2.6.25.16"
1.135 +
1.136 +config KERNEL_V_2_6_25_17
1.137 + bool
1.138 + prompt "2.6.25.17"
1.139 +
1.140 +config KERNEL_V_2_6_26
1.141 + bool
1.142 + prompt "2.6.26"
1.143 +
1.144 +config KERNEL_V_2_6_26_1
1.145 + bool
1.146 + prompt "2.6.26.1"
1.147 +
1.148 +config KERNEL_V_2_6_26_2
1.149 + bool
1.150 + prompt "2.6.26.2"
1.151 +
1.152 +config KERNEL_V_2_6_26_3
1.153 + bool
1.154 + prompt "2.6.26.3"
1.155 +
1.156 +config KERNEL_V_2_6_26_4
1.157 + bool
1.158 + prompt "2.6.26.4"
1.159 +
1.160 +config KERNEL_V_2_6_26_5
1.161 + bool
1.162 + prompt "2.6.26.5"
1.163 +
1.164 +# CT_INSERT_VERSION_ABOVE
1.165 +# Don't remove above line!
1.166 endchoice
1.167
1.168 -if KERNEL_LINUX_HEADERS_INSTALL
1.169 -
1.170 -config KERNEL_VERSION_SEE_EXTRAVERSION
1.171 - bool
1.172 - prompt "See extra versions"
1.173 - default n
1.174 - depends on KERNEL_LINUX_HEADERS_COPY || KERNEL_LINUX_HEADERS_INSTALL
1.175 - help
1.176 - See extra versions (kernel with 4 numbers, eg 2.6.19.1).
1.177 -
1.178 - If you say 'no', you'll only see sub-level, 3-digit versions.
1.179 - If you say 'yes', you'll see far more versions!
1.180 -
1.181 - It is recommended that you say 'no', unless you _*know*_
1.182 - that an extra version fixes a headers bug.
1.183 -
1.184 -source config/kernel/linux_headers_install.in
1.185 +config KERNEL_VERSION
1.186 + string
1.187 + default "2.6.18.8" if KERNEL_V_2_6_18_8
1.188 + default "2.6.19.7" if KERNEL_V_2_6_19_7
1.189 + default "2.6.20.21" if KERNEL_V_2_6_20_21
1.190 + default "2.6.21.7" if KERNEL_V_2_6_21_7
1.191 + default "2.6.22.19" if KERNEL_V_2_6_22_19
1.192 + default "2.6.23.17" if KERNEL_V_2_6_23_17
1.193 + default "2.6.24.7" if KERNEL_V_2_6_24_7
1.194 + default "2.6.25" if KERNEL_V_2_6_25
1.195 + default "2.6.25.1" if KERNEL_V_2_6_25_1
1.196 + default "2.6.25.2" if KERNEL_V_2_6_25_2
1.197 + default "2.6.25.3" if KERNEL_V_2_6_25_3
1.198 + default "2.6.25.4" if KERNEL_V_2_6_25_4
1.199 + default "2.6.25.5" if KERNEL_V_2_6_25_5
1.200 + default "2.6.25.6" if KERNEL_V_2_6_25_6
1.201 + default "2.6.25.7" if KERNEL_V_2_6_25_7
1.202 + default "2.6.25.8" if KERNEL_V_2_6_25_8
1.203 + default "2.6.25.9" if KERNEL_V_2_6_25_9
1.204 + default "2.6.25.10" if KERNEL_V_2_6_25_10
1.205 + default "2.6.25.11" if KERNEL_V_2_6_25_11
1.206 + default "2.6.25.12" if KERNEL_V_2_6_25_12
1.207 + default "2.6.25.13" if KERNEL_V_2_6_25_13
1.208 + default "2.6.25.14" if KERNEL_V_2_6_25_14
1.209 + default "2.6.25.14" if KERNEL_V_2_6_25_15
1.210 + default "2.6.25.15" if KERNEL_V_2_6_25_16
1.211 + default "2.6.25.15" if KERNEL_V_2_6_25_17
1.212 + default "2.6.26" if KERNEL_V_2_6_26
1.213 + default "2.6.26.1" if KERNEL_V_2_6_26_1
1.214 + default "2.6.26.2" if KERNEL_V_2_6_26_2
1.215 + default "2.6.26.3" if KERNEL_V_2_6_26_3
1.216 + default "2.6.26.4" if KERNEL_V_2_6_26_4
1.217 + default "2.6.26.5" if KERNEL_V_2_6_26_5
1.218 +# CT_INSERT_VERSION_STRING_ABOVE
1.219 +# Don't remove above line!
1.220
1.221 choice
1.222 bool
1.223 @@ -71,13 +229,22 @@
1.224
1.225 endif
1.226
1.227 -config KERNEL_LINUX_HEADERS_CUSTOM_DIR
1.228 +config KERNEL_LINUX_USE_CUSTOM_DIR
1.229 + bool
1.230 + prompt "Use custom directory"
1.231 + help
1.232 + If you have some kernel headers lying around, you can enter the path
1.233 + below.
1.234 +
1.235 +config KERNEL_LINUX_CUSTOM_DIR
1.236 string
1.237 prompt "Where are those custom headers?"
1.238 - depends on KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR
1.239 + depends on KERNEL_LINUX_USE_CUSTOM_DIR
1.240 help
1.241 Enter the base directory where the headers are to be found.
1.242
1.243 Eg. if the headers are in /some/place/include, then enter /some/place.
1.244 This is the same path you entered when you typed:
1.245 make INSTALL_HDR_PATH=/some/place headers_install
1.246 +
1.247 +endchoice
2.1 --- a/config/kernel/linux_headers_install.in Mon Sep 15 14:41:09 2008 +0000
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,211 +0,0 @@
2.4 -choice
2.5 - bool
2.6 - prompt "Linux kernel version"
2.7 -
2.8 -config KERNEL_INSTALL_V_2_6_18_8
2.9 - bool
2.10 - prompt "2.6.18.8 (OBSOLETE)"
2.11 - depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE
2.12 -
2.13 -config KERNEL_INSTALL_V_2_6_19_7
2.14 - bool
2.15 - prompt "2.6.19.7 (OBSOLETE)"
2.16 - depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE
2.17 -
2.18 -config KERNEL_INSTALL_V_2_6_20_21
2.19 - bool
2.20 - prompt "2.6.20.21 (OBSOLETE)"
2.21 - depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE
2.22 -
2.23 -config KERNEL_INSTALL_V_2_6_21_7
2.24 - bool
2.25 - prompt "2.6.21.7 (OBSOLETE)"
2.26 - depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE
2.27 -
2.28 -config KERNEL_INSTALL_V_2_6_22_19
2.29 - bool
2.30 - prompt "2.6.22.19 (OBSOLETE)"
2.31 - depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE
2.32 -
2.33 -config KERNEL_INSTALL_V_2_6_23_17
2.34 - bool
2.35 - prompt "2.6.23.17 (OBSOLETE)"
2.36 - depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE
2.37 -
2.38 -config KERNEL_INSTALL_V_2_6_24_7
2.39 - bool
2.40 - prompt "2.6.24.7 (OBSOLETE)"
2.41 - depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE
2.42 -
2.43 -config KERNEL_INSTALL_V_2_6_25
2.44 - bool
2.45 - prompt "2.6.25"
2.46 -
2.47 -config KERNEL_INSTALL_V_2_6_25_1
2.48 - bool
2.49 - prompt "2.6.25.1"
2.50 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.51 -
2.52 -config KERNEL_INSTALL_V_2_6_25_2
2.53 - bool
2.54 - prompt "2.6.25.2"
2.55 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.56 -
2.57 -config KERNEL_INSTALL_V_2_6_25_3
2.58 - bool
2.59 - prompt "2.6.25.3"
2.60 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.61 -
2.62 -config KERNEL_INSTALL_V_2_6_25_4
2.63 - bool
2.64 - prompt "2.6.25.4"
2.65 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.66 -
2.67 -config KERNEL_INSTALL_V_2_6_25_5
2.68 - bool
2.69 - prompt "2.6.25.5"
2.70 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.71 -
2.72 -config KERNEL_INSTALL_V_2_6_25_6
2.73 - bool
2.74 - prompt "2.6.25.6"
2.75 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.76 -
2.77 -config KERNEL_INSTALL_V_2_6_25_7
2.78 - bool
2.79 - prompt "2.6.25.7"
2.80 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.81 -
2.82 -config KERNEL_INSTALL_V_2_6_25_8
2.83 - bool
2.84 - prompt "2.6.25.8"
2.85 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.86 -
2.87 -config KERNEL_INSTALL_V_2_6_25_9
2.88 - bool
2.89 - prompt "2.6.25.9"
2.90 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.91 -
2.92 -config KERNEL_INSTALL_V_2_6_25_10
2.93 - bool
2.94 - prompt "2.6.25.10"
2.95 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.96 -
2.97 -config KERNEL_INSTALL_V_2_6_25_11
2.98 - bool
2.99 - prompt "2.6.25.11"
2.100 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.101 -
2.102 -config KERNEL_INSTALL_V_2_6_25_12
2.103 - bool
2.104 - prompt "2.6.25.12"
2.105 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.106 -
2.107 -config KERNEL_INSTALL_V_2_6_25_13
2.108 - bool
2.109 - prompt "2.6.25.13"
2.110 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.111 -
2.112 -config KERNEL_INSTALL_V_2_6_25_14
2.113 - bool
2.114 - prompt "2.6.25.14"
2.115 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.116 -
2.117 -config KERNEL_INSTALL_V_2_6_25_15
2.118 - bool
2.119 - prompt "2.6.25.15"
2.120 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.121 -
2.122 -config KERNEL_INSTALL_V_2_6_25_16
2.123 - bool
2.124 - prompt "2.6.25.16"
2.125 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.126 -
2.127 -config KERNEL_INSTALL_V_2_6_25_17
2.128 - bool
2.129 - prompt "2.6.25.17"
2.130 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.131 -
2.132 -config KERNEL_INSTALL_V_2_6_26
2.133 - bool
2.134 - prompt "2.6.26"
2.135 -
2.136 -config KERNEL_INSTALL_V_2_6_26_1
2.137 - bool
2.138 - prompt "2.6.26.1"
2.139 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.140 -
2.141 -config KERNEL_INSTALL_V_2_6_26_2
2.142 - bool
2.143 - prompt "2.6.26.2"
2.144 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.145 -
2.146 -config KERNEL_INSTALL_V_2_6_26_3
2.147 - bool
2.148 - prompt "2.6.26.3"
2.149 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.150 -
2.151 -config KERNEL_INSTALL_V_2_6_26_4
2.152 - bool
2.153 - prompt "2.6.26.4"
2.154 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.155 -
2.156 -config KERNEL_INSTALL_V_2_6_26_5
2.157 - bool
2.158 - prompt "2.6.26.5"
2.159 - depends on KERNEL_VERSION_SEE_EXTRAVERSION
2.160 -
2.161 -# CT_INSERT_VERSION_ABOVE
2.162 -# Don't remove above line!
2.163 -endchoice
2.164 -
2.165 -config KERNEL_VERSION
2.166 - string
2.167 - default "2.6.18.8" if KERNEL_INSTALL_V_2_6_18_8
2.168 - default "2.6.19.7" if KERNEL_INSTALL_V_2_6_19_7
2.169 - default "2.6.20.21" if KERNEL_INSTALL_V_2_6_20_21
2.170 - default "2.6.21.7" if KERNEL_INSTALL_V_2_6_21_7
2.171 - default "2.6.22.19" if KERNEL_INSTALL_V_2_6_22_19
2.172 - default "2.6.23.17" if KERNEL_INSTALL_V_2_6_23_17
2.173 - default "2.6.24" if KERNEL_INSTALL_V_2_6_24
2.174 - default "2.6.24.1" if KERNEL_INSTALL_V_2_6_24_1
2.175 - default "2.6.24.2" if KERNEL_INSTALL_V_2_6_24_2
2.176 - default "2.6.24.3" if KERNEL_INSTALL_V_2_6_24_3
2.177 - default "2.6.24.4" if KERNEL_INSTALL_V_2_6_24_4
2.178 - default "2.6.24.5" if KERNEL_INSTALL_V_2_6_24_5
2.179 - default "2.6.24.6" if KERNEL_INSTALL_V_2_6_24_6
2.180 - default "2.6.24.7" if KERNEL_INSTALL_V_2_6_24_7
2.181 - default "2.6.25" if KERNEL_INSTALL_V_2_6_25
2.182 - default "2.6.25.1" if KERNEL_INSTALL_V_2_6_25_1
2.183 - default "2.6.25.2" if KERNEL_INSTALL_V_2_6_25_2
2.184 - default "2.6.25.3" if KERNEL_INSTALL_V_2_6_25_3
2.185 - default "2.6.25.4" if KERNEL_INSTALL_V_2_6_25_4
2.186 - default "2.6.25.5" if KERNEL_INSTALL_V_2_6_25_5
2.187 - default "2.6.25.6" if KERNEL_INSTALL_V_2_6_25_6
2.188 - default "2.6.25.7" if KERNEL_INSTALL_V_2_6_25_7
2.189 - default "2.6.25.8" if KERNEL_INSTALL_V_2_6_25_8
2.190 - default "2.6.25.9" if KERNEL_INSTALL_V_2_6_25_9
2.191 - default "2.6.25.10" if KERNEL_INSTALL_V_2_6_25_10
2.192 - default "2.6.25.11" if KERNEL_INSTALL_V_2_6_25_11
2.193 - default "2.6.25.12" if KERNEL_INSTALL_V_2_6_25_12
2.194 - default "2.6.25.13" if KERNEL_INSTALL_V_2_6_25_13
2.195 - default "2.6.25.14" if KERNEL_INSTALL_V_2_6_25_14
2.196 - default "2.6.25.14" if KERNEL_INSTALL_V_2_6_25_15
2.197 - default "2.6.25.15" if KERNEL_INSTALL_V_2_6_25_16
2.198 - default "2.6.25.15" if KERNEL_INSTALL_V_2_6_25_17
2.199 - default "2.6.26" if KERNEL_INSTALL_V_2_6_26
2.200 - default "2.6.26.1" if KERNEL_INSTALL_V_2_6_26_1
2.201 - default "2.6.26.2" if KERNEL_INSTALL_V_2_6_26_2
2.202 - default "2.6.26.3" if KERNEL_INSTALL_V_2_6_26_3
2.203 - default "2.6.26.4" if KERNEL_INSTALL_V_2_6_26_4
2.204 - default "2.6.26.5" if KERNEL_INSTALL_V_2_6_26_5
2.205 -# CT_INSERT_VERSION_STRING_ABOVE
2.206 -# Don't remove above line!
2.207 -
2.208 -config KERNEL_LINUX_HEADERS_INSTALL_CHECK
2.209 - bool
2.210 - prompt "Check installed headers"
2.211 - default y
2.212 - help
2.213 - If you are in doubt that installed headers are buggy, say 'Y'
2.214 - here to have an extra check passed onto the headers.
3.1 --- a/scripts/build/kernel/linux.sh Mon Sep 15 14:41:09 2008 +0000
3.2 +++ b/scripts/build/kernel/linux.sh Mon Sep 15 14:52:29 2008 +0000
3.3 @@ -3,13 +3,12 @@
3.4 # Licensed under the GPL v2. See COPYING in the root of this package
3.5
3.6 do_print_filename() {
3.7 - [ "${CT_KERNEL}" = "linux" ] || return 0
3.8 echo "linux-${CT_KERNEL_VERSION}"
3.9 }
3.10
3.11 # Download the kernel
3.12 do_kernel_get() {
3.13 - if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
3.14 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
3.15 CT_GetFile "${CT_KERNEL_FILE}" {ftp,http}://ftp.kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
3.16 fi
3.17 return 0
3.18 @@ -17,7 +16,7 @@
3.19
3.20 # Extract kernel
3.21 do_kernel_extract() {
3.22 - if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
3.23 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
3.24 CT_ExtractAndPatch "${CT_KERNEL_FILE}"
3.25 fi
3.26 return 0
3.27 @@ -27,7 +26,7 @@
3.28 do_kernel_headers() {
3.29 CT_DoStep INFO "Installing kernel headers"
3.30
3.31 - if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" = "y" ]; then
3.32 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" = "y" ]; then
3.33 do_kernel_preinstalled
3.34 else
3.35 do_kernel_install
3.36 @@ -59,7 +58,7 @@
3.37 ${V_OPT} \
3.38 headers_install
3.39
3.40 - if [ "${CT_KERNEL_LINUX_HEADERS_INSTALL_CHECK}" = "y" ]; then
3.41 + if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then
3.42 CT_DoLog EXTRA "Checking installed headers"
3.43 CT_DoExecLog ALL \
3.44 make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" \
3.45 @@ -79,6 +78,6 @@
3.46 CT_DoLog EXTRA "Copying preinstalled kernel headers"
3.47
3.48 mkdir -p "${CT_SYSROOT_DIR}/usr"
3.49 - cd "${CT_KERNEL_LINUX_HEADERS_CUSTOM_DIR}"
3.50 - cp -rv include "${CT_SYSROOT_DIR}/usr" 2>&1 |CT_DoLog ALL
3.51 + cd "${CT_KERNEL_LINUX_CUSTOM_DIR}"
3.52 + CT_DoExecLog ALL cp -rv include "${CT_SYSROOT_DIR}/usr"
3.53 }
4.1 --- a/tools/addToolVersion.sh Mon Sep 15 14:41:09 2008 +0000
4.2 +++ b/tools/addToolVersion.sh Mon Sep 15 14:52:29 2008 +0000
4.3 @@ -7,7 +7,7 @@
4.4 cat <<-EOF
4.5 Usage: ${myname} <tool> [option] <version>
4.6 'tool' in one of:
4.7 - --gcc, --binutils, --glibc, --uClibc, --linux,
4.8 + --gcc, --binutils, --glibc, --eglibc, --uClibc, --linux,
4.9 --gdb, --dmalloc, --duma, --strace, --ltrace, --libelf
4.10 --gmp, --mpfr
4.11
4.12 @@ -18,24 +18,20 @@
4.13 --obsolete, -o
4.14 mark the version as being obsolete
4.15
4.16 - Valid mandatory 'option' for tool==linux is one and only one of:
4.17 - --install, --sanitised, --copy
4.18 -
4.19 'version' is a valid version for the specified tool.
4.20
4.21 Examples:
4.22 - add version 2.6.19.2 to linux kernel install method:
4.23 - ${myname} --linux --install 2.6.19.2
4.24 + add version 2.6.19.2 to linux kernel:
4.25 + ${myname} --linux 2.6.19.2
4.26
4.27 - add versions 2.3.5 and 2.3.6 to glibc:
4.28 - ${myname} --glibc 2.3.5 2.3.6
4.29 + add experimental versions 2.3.5 and 2.3.6 to glibc:
4.30 + ${myname} --glibc -x 2.3.5 2.3.6
4.31 EOF
4.32 }
4.33
4.34 cat=
4.35 tool=
4.36 tool_prefix=
4.37 -tool_suffix=
4.38 VERSION=
4.39 EXP=
4.40 OBS=
4.41 @@ -45,25 +41,23 @@
4.42 while [ $i -le $# ]; do
4.43 case "${!i}" in
4.44 # Tools:
4.45 - --gcc) cat=CC; tool=gcc; tool_prefix=cc; tool_suffix=;;
4.46 - --binutils) cat=BINUTILS; tool=binutils; tool_prefix=; tool_suffix=;;
4.47 - --glibc) cat=LIBC; tool=glibc; tool_prefix=libc; tool_suffix=;;
4.48 - --uClibc) cat=LIBC; tool=uClibc; tool_prefix=libc; tool_suffix=;;
4.49 - --linux) cat=KERNEL; tool=linux; tool_prefix=kernel; tool_suffix=;;
4.50 - --gdb) cat=GDB; tool=gdb; tool_prefix=debug tool_suffix=;;
4.51 - --dmalloc) cat=DMALLOC; tool=dmalloc; tool_prefix=debug tool_suffix=;;
4.52 - --duma) cat=DUMA; tool=duma; tool_prefix=debug tool_suffix=;;
4.53 - --strace) cat=STRACE; tool=strace; tool_prefix=debug tool_suffix=;;
4.54 - --ltrace) cat=LTRACE; tool=ltrace; tool_prefix=debug tool_suffix=;;
4.55 - --libelf) cat=LIBELF; tool=libelf; tool_prefix=tools tool_suffix=;;
4.56 - --gmp) cat=GMP; tool=gmp; tool_prefix=cc; tool_suffix=;;
4.57 - --mpfr) cat=MPFR; tool=mpfr; tool_prefix=cc; tool_suffix=;;
4.58 + --gcc) cat=CC; tool=gcc; tool_prefix=cc;;
4.59 + --binutils) cat=BINUTILS; tool=binutils; tool_prefix=;;
4.60 + --glibc) cat=LIBC; tool=glibc; tool_prefix=libc;;
4.61 + --eglibc) cat=LIBC; tool=eglibc; tool_prefix=libc;;
4.62 + --uClibc) cat=LIBC; tool=uClibc; tool_prefix=libc;;
4.63 + --linux) cat=KERNEL; tool=linux; tool_prefix=kernel;;
4.64 + --gdb) cat=GDB; tool=gdb; tool_prefix=debug;;
4.65 + --dmalloc) cat=DMALLOC; tool=dmalloc; tool_prefix=debug;;
4.66 + --duma) cat=DUMA; tool=duma; tool_prefix=debug;;
4.67 + --strace) cat=STRACE; tool=strace; tool_prefix=debug;;
4.68 + --ltrace) cat=LTRACE; tool=ltrace; tool_prefix=debug;;
4.69 + --libelf) cat=LIBELF; tool=libelf; tool_prefix=tools;;
4.70 + --gmp) cat=GMP; tool=gmp; tool_prefix=gmp_mpfr;;
4.71 + --mpfr) cat=MPFR; tool=mpfr; tool_prefix=gmp_mpfr;;
4.72 # Tools options:
4.73 -x|--experimental) EXP=1; OBS=; prompt_suffix=" (EXPERIMENTAL)";;
4.74 -o|--obsolete) OBS=1; EXP=; prompt_suffix=" (OBSOLETE)";;
4.75 - --install) tool_suffix=install;;
4.76 - --sanitised) tool_suffix=sanitised;;
4.77 - --copy) tool_suffix=copy;;
4.78 # Misc:
4.79 -h|--help) doHelp; exit 0;;
4.80 -*) echo "Unknown option: '${!i}' (use -h/--help for help)."; exit 1;;
4.81 @@ -74,51 +68,26 @@
4.82
4.83 [ -n "${tool}" -o -n "${VERSION}" ] || { doHelp; exit 1; }
4.84
4.85 -case "${cat}" in
4.86 - KERNEL) [ -z "${tool_suffix}" ] && { doHelp; exit 1; } ;;
4.87 - *) ;;
4.88 -esac
4.89 -
4.90 for ver in ${VERSION}; do
4.91 - # Split VERSION into MAJOR MINOR PATCHLEVEL EXTRAVERSION
4.92 - ver_M=$(echo "${ver}...." |cut -d . -f 1)
4.93 - ver_m=$(echo "${ver}...." |cut -d . -f 2)
4.94 - ver_P=$(echo "${ver}...." |cut -d . -f 3)
4.95 - ver_E=$(echo "${ver}...." |cut -d . -f 4)
4.96 - unset DEP L1 L2 L3 L4 L5 L6 FILE
4.97 + unset DEP L1 L2 L3 L4 L5 L6 FILE v ver_M ver_m
4.98 + FILE="config/${tool_prefix}/${tool}.in"
4.99 v=$(echo "${ver}" |sed -r -e 's/-/_/g; s/\./_/g;')
4.100 - if [ "${cat}" = "KERNEL" ]; then
4.101 - TOOL_SUFFIX=$(echo "${tool_suffix}" |tr [[:lower:]] [[:upper:]])
4.102 - L1="config ${cat}_${TOOL_SUFFIX}_V_${v}\n"
4.103 - L2=" bool\n"
4.104 - L3=" prompt \"${ver}${prompt_suffix}\"\n"
4.105 - # Extra versions are not necessary visible:
4.106 - case "${tool_suffix},${ver}" in
4.107 - sanitised,*) ;; # Sanitised headers always have an extra version
4.108 - *,*.*.*.*) DEP="${DEP} && KERNEL_VERSION_SEE_EXTRAVERSION";;
4.109 - esac
4.110 - L6=" default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
4.111 - FILE="config/${tool_prefix}/${tool}_headers_${tool_suffix}.in"
4.112 - else
4.113 - L1="config ${cat}_V_${v}\n"
4.114 - L2=" bool\n"
4.115 - L3=" prompt \"${ver}${prompt_suffix}\"\n"
4.116 - L6=" default \"${ver}\" if ${cat}_V_${v}"
4.117 - case "${tool}" in
4.118 - gcc)
4.119 - if [ ${ver_M} -gt 4 -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then
4.120 - L5=" select CC_GCC_4_3_or_later\n"
4.121 - fi
4.122 - ;;
4.123 - esac
4.124 - FILE="config/${tool_prefix}/${tool}.in"
4.125 - fi
4.126 + L1="config ${cat}_V_${v}\n"
4.127 + L2=" bool\n"
4.128 + L3=" prompt \"${ver}${prompt_suffix}\"\n"
4.129 [ -n "${EXP}" ] && DEP="${DEP} && EXPERIMENTAL"
4.130 [ -n "${OBS}" ] && DEP="${DEP} && OBSOLETE"
4.131 - case "${DEP}" in
4.132 - "") ;;
4.133 - *) L4=" depends on "$(echo "${DEP}" |sed -r -e 's/^ \&\& //; s/\&/\\&/g;')"\n"
4.134 - esac
4.135 - sed -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${L1}${L2}${L3}${L4}${L5}"'\n\1/;
4.136 - s/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${L6}"'\n\1/;' "${FILE}"
4.137 + [ -n "${DEP}" ] && L4=" depends on "$(echo "${DEP}" |sed -r -e 's/^ \&\& //; s/\&/\\&/g;')"\n"
4.138 + if [ "${tool}" = "gcc" ]; then
4.139 + # Extract 'M'ajor and 'm'inor from version string
4.140 + ver_M=$(echo "${ver}...." |cut -d . -f 1)
4.141 + ver_m=$(echo "${ver}...." |cut -d . -f 2)
4.142 + if [ ${ver_M} -gt 4 -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then
4.143 + L5=" select CC_GCC_4_3_or_later\n"
4.144 + fi
4.145 + fi
4.146 + L6=" default \"${ver}\" if ${cat}_V_${v}"
4.147 + sed -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${L1}${L2}${L3}${L4}${L5}"'\n\1/;' \
4.148 + -e 's/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${L6}"'\n\1/;' \
4.149 + "${FILE}"
4.150 done