From 5d967e8b3949db7f4b8dae31e2f0b14efc568de9 Mon Sep 17 00:00:00 2001 From: Bryan Hundven Date: Thu, 26 Nov 2015 03:43:03 -0800 Subject: Linux: Remove obsolete Linux custom headers This option allowed you to use a custom headers directory/tarball to use in your sysroot. Not to be confused with using a custom source, that option is the preferred method. Signed-off-by: Bryan Hundven Reviewed-by: "Yann E. MORIN" diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 3d919df..5b429ec 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -5,22 +5,6 @@ ## ## help Build a toolchain targeting systems running Linux as a kernel. -config KERNEL_LINUX_USE_CUSTOM_HEADERS - bool - prompt "Use pre-installed headers tree (OBSOLETE)" - depends on OBSOLETE - help - If you have some pre-installed kernel headers lying around, you can - enter the path to these headers, below, they will be copied from - there, and into the toolchain's sysroot. - - Note: - This will *not* let you use a complete kernel tree! - If you want to use your own full kernel tree, then you want to say 'N' - here, and select KERNEL_LINUX_CUSTOM, in the versions list, below. - -if ! KERNEL_LINUX_USE_CUSTOM_HEADERS - choice bool prompt "Linux kernel version" @@ -99,32 +83,3 @@ config KERNEL_VERSION default "3.2.72" if KERNEL_V_3_2 default "2.6.32.68" if KERNEL_V_2_6_32 default "custom" if KERNEL_LINUX_CUSTOM - -endif # ! KERNEL_LINUX_USE_CUSTOM_HEADERS - -if KERNEL_LINUX_USE_CUSTOM_HEADERS - -config KERNEL_LINUX_CUSTOM_PATH - string - prompt "Path to custom headers directory/tarball" - help - See KERNEL_LINUX_CUSTOM_IS_TARBALL, below. - -config KERNEL_LINUX_CUSTOM_IS_TARBALL - bool - prompt "This is a tarball" - help - If you say 'n' here, the path above is expected to point to a directory - containing readily prepared headers - - If you say 'y' here, then the path above is expected to point to a - tarball of such a directory. - - Eg., if your headers are available in: /foo/bar/buz/my_hdrs/include, - say 'n' here, and enter: /foo/bar/buz/my_hdrs below. - - Now, passing a tarball around is easier than passing a directory, so - if you want to, you can make a tarball of /foo/bar/buz/my_hdrs/include, - say 'y' here, and enter the path to this tarball below. - -endif # KERNEL_LINUX_USE_CUSTOM_HEADERS diff --git a/config/kernel/linux.in.2 b/config/kernel/linux.in.2 index 8e93958..80e13f3 100644 --- a/config/kernel/linux.in.2 +++ b/config/kernel/linux.in.2 @@ -1,7 +1,5 @@ # Linux kernel options -if ! KERNEL_LINUX_USE_CUSTOM_HEADERS - choice bool prompt "Kernel verbosity:" @@ -40,5 +38,3 @@ config KERNEL_LINUX_INSTALL_CHECK help If you are in doubt that installed headers are buggy, say 'Y' here to have an extra check passed onto the headers. - -endif # ! KERNEL_LINUX_USE_CUSTOM_HEADERS diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index 49fe613..d7da1c4 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -23,10 +23,6 @@ do_kernel_get() { local rel_dir local korg_base mirror_base - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then - return 0 - fi - if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then CT_GetCustom "linux" "${CT_KERNEL_VERSION}" \ "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" @@ -59,11 +55,6 @@ do_kernel_get() { # Extract kernel do_kernel_extract() { - # If using a custom headers tree, nothing to do - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then - return 0 - fi - # If using a custom directory location, nothing to do if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" \ -a -d "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" ]; then @@ -81,25 +72,12 @@ do_kernel_extract() { CT_Patch "linux" "${CT_KERNEL_VERSION}" } -# Wrapper to the actual headers install method -do_kernel_headers() { - CT_DoStep INFO "Installing kernel headers" - - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then - do_kernel_custom - else - do_kernel_install - fi - - CT_EndStep -} - # Install kernel headers using headers_install from kernel sources. -do_kernel_install() { +do_kernel_headers() { local kernel_path local kernel_arch - CT_DoLog DEBUG "Using kernel's headers_install" + CT_DoStep INFO "Installing kernel headers" mkdir -p "${CT_BUILD_DIR}/build-kernel-headers" @@ -145,28 +123,6 @@ do_kernel_install() { -o -name '..check.cmd' \ \) \ -exec rm {} \; -} -# 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_custom() { - local tar_opt - - CT_DoLog EXTRA "Installing custom kernel headers" - - mkdir -p "${CT_SYSROOT_DIR}/usr" - cd "${CT_SYSROOT_DIR}/usr" - if [ "${CT_KERNEL_LINUX_CUSTOM_IS_TARBALL}" = "y" ]; then - case "${CT_KERNEL_LINUX_CUSTOM_PATH}" in - *.tar) ;; - *.tgz) tar_opt=--gzip;; - *.tar.gz) tar_opt=--gzip;; - *.tar.bz2) tar_opt=--bzip2;; - *.tar.xz) tar_opt=--xz;; - esac - CT_DoExecLog ALL tar x ${tar_opt} -vf ${CT_KERNEL_LINUX_CUSTOM_PATH} - else - CT_DoExecLog ALL cp -rv "${CT_KERNEL_LINUX_CUSTOM_PATH}/include" . - fi + CT_EndStep } diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index 34e6594..a070dc2 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -37,12 +37,6 @@ if [ "${CT_CUSTOM_PATCH}" = "y" ]; then echo "You will not be able to (easily) share this sample in this case." read -p "Press Ctrl-C to stop now, or Enter to continue..." fi -if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then - exec >&7 - echo "You are using custom Linux headers." - echo "You will not be able to (easily) share this sample in this case." - read -p "Press Ctrl-C to stop now, or Enter to continue..." -fi # Do not use a progress bar unset CT_LOG_PROGRESS_BAR -- cgit v0.10.2-6-g49f6