summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-03-03 20:29:35 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-03-03 20:29:35 (GMT)
commitb6b7925fcb3093e8d9fabed7d2d61ad1b4312daf (patch)
tree33fff5e001c719031736855954f5e4aa81f6a1b5
parentea604716d9852e5b5fe0e158b822ea0878f3925f (diff)
Rename the custom header option.
/trunk/scripts/build/kernel/linux.sh | 12 6 6 0 ++++++------ /trunk/config/kernel/linux.in | 4 2 2 0 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)
-rw-r--r--config/kernel/linux.in4
-rw-r--r--scripts/build/kernel/linux.sh12
2 files changed, 8 insertions, 8 deletions
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 2dcb34b..5e7fbd7 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -284,14 +284,14 @@ config KERNEL_LINUX_VERBOSE_LEVEL
endif
-config KERNEL_LINUX_USE_CUSTOM_DIR
+config KERNEL_LINUX_USE_CUSTOM_HEADERS
bool
prompt "Use custom headers"
help
If you have some kernel headers lying around, you can enter the path
below.
-if KERNEL_LINUX_USE_CUSTOM_DIR
+if KERNEL_LINUX_USE_CUSTOM_HEADERS
config KERNEL_LINUX_CUSTOM_IS_TARBALL
bool
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 6563260..5f177d5 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -9,7 +9,7 @@ CT_DoKernelTupleValues() {
# Download the kernel
do_kernel_get() {
- if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
+ if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
CT_GetFile "linux-${CT_KERNEL_VERSION}" \
{ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
fi
@@ -18,7 +18,7 @@ do_kernel_get() {
# Extract kernel
do_kernel_extract() {
- if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
+ if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
CT_Extract "linux-${CT_KERNEL_VERSION}"
CT_Patch "linux-${CT_KERNEL_VERSION}"
fi
@@ -29,8 +29,8 @@ do_kernel_extract() {
do_kernel_headers() {
CT_DoStep INFO "Installing kernel headers"
- if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" = "y" ]; then
- do_kernel_preinstalled
+ if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then
+ do_kernel_custom
else
do_kernel_install
fi
@@ -74,10 +74,10 @@ do_kernel_install() {
fi
}
-# Use preinstalled headers (most probably by using make headers_install in a
+# Use custom headers (most probably by using make headers_install in a
# modified (read: customised) kernel tree, or using pre-2.6.18 headers, such
# as 2.4). In this case, simply copy the headers in place
-do_kernel_preinstalled() {
+do_kernel_custom() {
local tar_opt
CT_DoLog EXTRA "Installing custom kernel headers"