From 45747a64532234fc700eca0712b5a81393ee9565 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 20 May 2009 20:13:13 +0000 Subject: Merge the uClinux/noMMU stuff back to /trunk: - merge Linux and uClinux back to a single kernel - add ARCH_USE_MMU and acquainted config options that architectures can auto-select - make binutils and elf2flt two "Binary utilities" that go in a single common sub-{menu,directory} structure -------- diffstat follows -------- /trunk/scripts/build/kernel/uclinux.sh | 2 0 2 0 - /trunk/scripts/build/kernel/linux.sh | 206 204 2 0 +++++++++++++++++++++++++++++ /trunk/scripts/build/kernel/linux-common.sh | 198 0 198 0 ---------------------------- /trunk/scripts/build/binutils.sh | 232 0 232 0 -------------------------------- /trunk/scripts/build/elf2flt.sh | 150 0 150 0 --------------------- /trunk/scripts/crosstool-NG.sh.in | 6 4 2 0 + /trunk/config/kernel/linux.in | 249 249 0 0 +++++++++++++++++++++++++++++++++++ /trunk/config/kernel/linux.in-common | 252 0 252 0 ----------------------------------- /trunk/config/kernel/uclinux.in | 21 0 21 0 --- /trunk/config/target.in | 23 22 1 0 +++ /trunk/config/elf2flt.in | 49 0 49 0 ------- /trunk/config/libc/glibc.in | 2 1 1 0 /trunk/config/libc/eglibc.in | 2 1 1 0 /trunk/config/config.in | 1 0 1 0 - /trunk/config/arch/sh.in | 1 1 0 0 + /trunk/config/arch/arm.in | 2 1 1 0 /trunk/config/arch/powerpc.in | 1 1 0 0 + /trunk/config/arch/ia64.in | 1 1 0 0 + /trunk/config/arch/alpha.in | 1 1 0 0 + /trunk/config/arch/x86.in | 1 1 0 0 + /trunk/config/arch/mips.in | 1 1 0 0 + /trunk/config/arch/powerpc64.in | 1 1 0 0 + 22 files changed, 489 insertions(+), 913 deletions(-) --- scripts/build/binutils.sh | 116 ----------------------------------- scripts/build/binutils/binutils.sh | 116 +++++++++++++++++++++++++++++++++++ scripts/build/binutils/elf2flt.sh | 69 +++++++++++++++++++++ scripts/build/elf2flt.sh | 75 ---------------------- scripts/build/kernel/linux-common.sh | 99 ------------------------------ scripts/build/kernel/linux.sh | 103 ++++++++++++++++++++++++++++++- scripts/build/kernel/uclinux.sh | 1 - scripts/crosstool-NG.sh.in | 3 +- 8 files changed, 289 insertions(+), 293 deletions(-) delete mode 100644 scripts/build/binutils.sh create mode 100644 scripts/build/binutils/binutils.sh create mode 100644 scripts/build/binutils/elf2flt.sh delete mode 100644 scripts/build/elf2flt.sh delete mode 100644 scripts/build/kernel/linux-common.sh delete mode 100644 scripts/build/kernel/uclinux.sh (limited to 'scripts') diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh deleted file mode 100644 index 17f04fb0..00000000 --- a/scripts/build/binutils.sh +++ /dev/null @@ -1,116 +0,0 @@ -# This file adds functions to build binutils -# Copyright 2007 Yann E. MORIN -# Licensed under the GPL v2. See COPYING in the root of this package - -# Download binutils -do_binutils_get() { - CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \ - {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \ - ftp://gcc.gnu.org/pub/binutils/{releases,snapshots} -} - -# Extract binutils -do_binutils_extract() { - CT_Extract "binutils-${CT_BINUTILS_VERSION}" - CT_Patch "binutils-${CT_BINUTILS_VERSION}" -} - -# Build binutils -do_binutils() { - mkdir -p "${CT_BUILD_DIR}/build-binutils" - cd "${CT_BUILD_DIR}/build-binutils" - - CT_DoStep INFO "Installing binutils" - - binutils_opts= - # If GMP and MPFR were configured, then use that, - # otherwise let binutils find the system-wide libraries, if they exist. - if [ "${CT_GMP_MPFR}" = "y" ]; then - binutils_opts="--with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" - fi - - CT_DoLog EXTRA "Configuring binutils" - CFLAGS="${CT_CFLAGS_FOR_HOST}" \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \ - --build=${CT_BUILD} \ - --host=${CT_HOST} \ - --target=${CT_TARGET} \ - --prefix=${CT_PREFIX_DIR} \ - --disable-nls \ - --disable-multilib \ - --disable-werror \ - ${binutils_opts} \ - ${CT_ARCH_WITH_FLOAT} \ - ${CT_BINUTILS_EXTRA_CONFIG} \ - ${BINUTILS_SYSROOT_ARG} - - CT_DoLog EXTRA "Building binutils" - CT_DoExecLog ALL make ${PARALLELMFLAGS} - - CT_DoLog EXTRA "Installing binutils" - CT_DoExecLog ALL make install - - # Make those new tools available to the core C compilers to come. - # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as - # well. Create that. - mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin" - mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin" - mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin" - mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin" - for t in ar as ld strip; do - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}" - done 2>&1 |CT_DoLog ALL - - CT_EndStep -} - -# Now on for the target libraries -do_binutils_target() { - targets= - [ "${CT_BINUTILS_FOR_TARGET_IBERTY}" = "y" ] && targets="${targets} libiberty" - [ "${CT_BINUTILS_FOR_TARGET_BFD}" = "y" ] && targets="${targets} bfd" - targets="${targets# }" - - binutils_opts= - # If GMP and MPFR were configured, then use that - if [ "${CT_GMP_MPFR_TARGET}" = "y" ]; then - binutils_opts="--with-gmp=${CT_SYSROOT_DIR}/usr --with-mpfr=${CT_SYSROOT_DIR}/usr" - fi - - if [ -n "${targets}" ]; then - CT_DoStep INFO "Installing binutils for target" - mkdir -p "${CT_BUILD_DIR}/build-binutils-for-target" - CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target" - - CT_DoLog EXTRA "Configuring binutils for target" - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \ - --build=${CT_BUILD} \ - --host=${CT_TARGET} \ - --target=${CT_TARGET} \ - --prefix=/usr \ - --disable-werror \ - --enable-shared \ - --enable-static \ - --disable-nls \ - --disable-multilib \ - ${binutils_opts} \ - ${CT_ARCH_WITH_FLOAT} \ - ${CT_BINUTILS_EXTRA_CONFIG} - - build_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1all-/g;') - install_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1install-/g;') - - CT_DoLog EXTRA "Building binutils' libraries (${targets}) for target" - CT_DoExecLog ALL make ${PARALLELMFLAGS} ${build_targets} - CT_DoLog EXTRA "Installing binutils' libraries (${targets}) for target" - CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" ${install_targets} - - CT_Popd - CT_EndStep - fi -} diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh new file mode 100644 index 00000000..17f04fb0 --- /dev/null +++ b/scripts/build/binutils/binutils.sh @@ -0,0 +1,116 @@ +# This file adds functions to build binutils +# Copyright 2007 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +# Download binutils +do_binutils_get() { + CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \ + {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \ + ftp://gcc.gnu.org/pub/binutils/{releases,snapshots} +} + +# Extract binutils +do_binutils_extract() { + CT_Extract "binutils-${CT_BINUTILS_VERSION}" + CT_Patch "binutils-${CT_BINUTILS_VERSION}" +} + +# Build binutils +do_binutils() { + mkdir -p "${CT_BUILD_DIR}/build-binutils" + cd "${CT_BUILD_DIR}/build-binutils" + + CT_DoStep INFO "Installing binutils" + + binutils_opts= + # If GMP and MPFR were configured, then use that, + # otherwise let binutils find the system-wide libraries, if they exist. + if [ "${CT_GMP_MPFR}" = "y" ]; then + binutils_opts="--with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" + fi + + CT_DoLog EXTRA "Configuring binutils" + CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \ + --build=${CT_BUILD} \ + --host=${CT_HOST} \ + --target=${CT_TARGET} \ + --prefix=${CT_PREFIX_DIR} \ + --disable-nls \ + --disable-multilib \ + --disable-werror \ + ${binutils_opts} \ + ${CT_ARCH_WITH_FLOAT} \ + ${CT_BINUTILS_EXTRA_CONFIG} \ + ${BINUTILS_SYSROOT_ARG} + + CT_DoLog EXTRA "Building binutils" + CT_DoExecLog ALL make ${PARALLELMFLAGS} + + CT_DoLog EXTRA "Installing binutils" + CT_DoExecLog ALL make install + + # Make those new tools available to the core C compilers to come. + # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as + # well. Create that. + mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin" + mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin" + mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin" + mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin" + for t in ar as ld strip; do + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}" + done 2>&1 |CT_DoLog ALL + + CT_EndStep +} + +# Now on for the target libraries +do_binutils_target() { + targets= + [ "${CT_BINUTILS_FOR_TARGET_IBERTY}" = "y" ] && targets="${targets} libiberty" + [ "${CT_BINUTILS_FOR_TARGET_BFD}" = "y" ] && targets="${targets} bfd" + targets="${targets# }" + + binutils_opts= + # If GMP and MPFR were configured, then use that + if [ "${CT_GMP_MPFR_TARGET}" = "y" ]; then + binutils_opts="--with-gmp=${CT_SYSROOT_DIR}/usr --with-mpfr=${CT_SYSROOT_DIR}/usr" + fi + + if [ -n "${targets}" ]; then + CT_DoStep INFO "Installing binutils for target" + mkdir -p "${CT_BUILD_DIR}/build-binutils-for-target" + CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target" + + CT_DoLog EXTRA "Configuring binutils for target" + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \ + --build=${CT_BUILD} \ + --host=${CT_TARGET} \ + --target=${CT_TARGET} \ + --prefix=/usr \ + --disable-werror \ + --enable-shared \ + --enable-static \ + --disable-nls \ + --disable-multilib \ + ${binutils_opts} \ + ${CT_ARCH_WITH_FLOAT} \ + ${CT_BINUTILS_EXTRA_CONFIG} + + build_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1all-/g;') + install_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1install-/g;') + + CT_DoLog EXTRA "Building binutils' libraries (${targets}) for target" + CT_DoExecLog ALL make ${PARALLELMFLAGS} ${build_targets} + CT_DoLog EXTRA "Installing binutils' libraries (${targets}) for target" + CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" ${install_targets} + + CT_Popd + CT_EndStep + fi +} diff --git a/scripts/build/binutils/elf2flt.sh b/scripts/build/binutils/elf2flt.sh new file mode 100644 index 00000000..b3947a9b --- /dev/null +++ b/scripts/build/binutils/elf2flt.sh @@ -0,0 +1,69 @@ +# This file adds functions to build elf2flt +# Copyright 2009 John Williams +# Copyright 2007 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +# Download elf2flt +do_elf2flt_get() { + CT_GetCVS "elf2flt-cvs-${CT_ELF2FLT_VERSION}" \ + ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \ + "elf2flt" \ + "" \ + "elf2flt-cvs-${CT_ELF2FLT_VERSION}" +} + +# Extract elf2flt +do_elf2flt_extract() { + CT_Extract "elf2flt-cvs-${CT_ELF2FLT_VERSION}" + CT_Patch "elf2flt-cvs-${CT_ELF2FLT_VERSION}" +} + +# Build elf2flt +do_elf2flt() { + [ -z ${CT_KERNEL_UCLINUX_BINFMT_FLAT} ] && return 0 + mkdir -p "${CT_BUILD_DIR}/build-elf2flt" + cd "${CT_BUILD_DIR}/build-elf2flt" + + CT_DoStep INFO "Installing elf2flt" + + elf2flt_opts= + binutils_bld=${CT_BUILD_DIR}/build-binutils + binutils_src=${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION} + + CT_DoLog EXTRA "Configuring elf2flt" + CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/elf2flt-cvs-${CT_ELF2FLT_VERSION}/configure" \ + --build=${CT_BUILD} \ + --host=${CT_HOST} \ + --target=${CT_TARGET} \ + --prefix=${CT_PREFIX_DIR} \ + --with-bfd-include-dir=${binutils_bld}/bfd \ + --with-binutils-include-dir=${binutils_src}/include \ + --with-libbfd=${binutils_bld}/bfd/libbfd.a \ + --with-libiberty=${binutils_bld}/libiberty/libiberty.a \ + ${elf2flt_opts} \ + ${CT_ELF2FLT_EXTRA_CONFIG} + + CT_DoLog EXTRA "Building elf2flt" + CT_DoExecLog ALL make ${PARALLELMFLAGS} + + CT_DoLog EXTRA "Installing elf2flt" + CT_DoExecLog ALL make install + + # Make those new tools available to the core C compilers to come. + # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as + # well. Create that. + mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin" + mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin" + mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin" + mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin" + for t in elf2flt flthdr; do + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}" + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}" + done 2>&1 |CT_DoLog ALL + + CT_EndStep +} diff --git a/scripts/build/elf2flt.sh b/scripts/build/elf2flt.sh deleted file mode 100644 index 538e6613..00000000 --- a/scripts/build/elf2flt.sh +++ /dev/null @@ -1,75 +0,0 @@ -# This file adds functions to build elf2flt -# Copyright 2009 John Williams -# Copyright 2007 Yann E. MORIN -# Licensed under the GPL v2. See COPYING in the root of this package - -# Download elf2flt -do_elf2flt_get() { - CT_GetCVS "elf2flt-cvs-${CT_ELF2FLT_VERSION}" \ - ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \ - "elf2flt" \ - "" \ - "elf2flt-cvs-${CT_ELF2FLT_VERSION}" -} - -# Extract elf2flt -do_elf2flt_extract() { - CT_Extract "elf2flt-cvs-${CT_ELF2FLT_VERSION}" - CT_Patch "elf2flt-cvs-${CT_ELF2FLT_VERSION}" -} - -# Build elf2flt -do_elf2flt() { - [ -z ${CT_KERNEL_UCLINUX_BINFMT_FLAT} ] && return 0 - mkdir -p "${CT_BUILD_DIR}/build-elf2flt" - cd "${CT_BUILD_DIR}/build-elf2flt" - - CT_DoStep INFO "Installing elf2flt" - - elf2flt_opts= - binutils_bld=${CT_BUILD_DIR}/build-binutils - binutils_src=${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION} - - CT_DoLog EXTRA "Configuring elf2flt" - CFLAGS="${CT_CFLAGS_FOR_HOST}" \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/elf2flt-cvs-${CT_ELF2FLT_VERSION}/configure" \ - --build=${CT_BUILD} \ - --host=${CT_HOST} \ - --target=${CT_TARGET} \ - --prefix=${CT_PREFIX_DIR} \ - --with-bfd-include-dir=${binutils_bld}/bfd \ - --with-binutils-include-dir=${binutils_src}/include \ - --with-libbfd=${binutils_bld}/bfd/libbfd.a \ - --with-libiberty=${binutils_bld}/libiberty/libiberty.a \ - ${elf2flt_opts} \ - ${CT_ELF2FLT_EXTRA_CONFIG} - - CT_DoLog EXTRA "Building elf2flt" - CT_DoExecLog ALL make ${PARALLELMFLAGS} - - CT_DoLog EXTRA "Installing elf2flt" - CT_DoExecLog ALL make install - - # Make those new tools available to the core C compilers to come. - # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as - # well. Create that. - mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin" - mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin" - mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin" - mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin" - for t in elf2flt flthdr; do - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}" - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}" - done 2>&1 |CT_DoLog ALL - - CT_EndStep -} - -# Now on for the target libraries -do_elf2flt_target() { - exit -1 -} - diff --git a/scripts/build/kernel/linux-common.sh b/scripts/build/kernel/linux-common.sh deleted file mode 100644 index fa6a9dde..00000000 --- a/scripts/build/kernel/linux-common.sh +++ /dev/null @@ -1,99 +0,0 @@ -# This file declares functions to install the kernel headers for linux -# Copyright 2007 Yann E. MORIN -# Licensed under the GPL v2. See COPYING in the root of this package - -CT_DoKernelTupleValues() { - # Nothing to do, keep the default value - : -} - -# Download the kernel -do_kernel_get() { - 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 - return 0 -} - -# Extract kernel -do_kernel_extract() { - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then - CT_Extract "linux-${CT_KERNEL_VERSION}" - CT_Patch "linux-${CT_KERNEL_VERSION}" - fi - return 0 -} - -# 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() { - CT_DoLog DEBUG "Using kernel's headers_install" - - mkdir -p "${CT_BUILD_DIR}/build-kernel-headers" - cd "${CT_BUILD_DIR}/build-kernel-headers" - - # Only starting with 2.6.18 does headers_install is usable. We only - # have 2.6 version available, so only test for sublevel. - k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile") - [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers." - - V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}" - - CT_DoLog EXTRA "Installing kernel headers" - CT_DoExecLog ALL \ - make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" \ - O=$(pwd) \ - ARCH=${CT_KERNEL_ARCH} \ - INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \ - ${V_OPT} \ - headers_install - - if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking installed headers" - CT_DoExecLog ALL \ - make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" \ - O=$(pwd) \ - ARCH=${CT_KERNEL_ARCH} \ - INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \ - ${V_OPT} \ - headers_check - find "${CT_SYSROOT_DIR}" -type f -name '.check*' -exec rm {} \; - fi -} - -# 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.lzma) tar_opt=--lzma;; - 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 -} diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index 0401c9ff..c545e7b4 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -1 +1,102 @@ -. ${CT_LIB_DIR}/scripts/build/kernel/linux-common.sh +# This file declares functions to install the kernel headers for linux +# Copyright 2007 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +CT_DoKernelTupleValues() { + if [ "${CT_ARCH_USE_MMU}" = "y" ]; then + CT_TARGET_KERNEL="linux" + else + CT_TARGET_KERNEL="uclinux" + fi +} + +# Download the kernel +do_kernel_get() { + 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 + return 0 +} + +# Extract kernel +do_kernel_extract() { + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then + CT_Extract "linux-${CT_KERNEL_VERSION}" + CT_Patch "linux-${CT_KERNEL_VERSION}" + fi + return 0 +} + +# 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() { + CT_DoLog DEBUG "Using kernel's headers_install" + + mkdir -p "${CT_BUILD_DIR}/build-kernel-headers" + cd "${CT_BUILD_DIR}/build-kernel-headers" + + # Only starting with 2.6.18 does headers_install is usable. We only + # have 2.6 version available, so only test for sublevel. + k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile") + [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers." + + V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}" + + CT_DoLog EXTRA "Installing kernel headers" + CT_DoExecLog ALL \ + make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" \ + O=$(pwd) \ + ARCH=${CT_KERNEL_ARCH} \ + INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \ + ${V_OPT} \ + headers_install + + if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then + CT_DoLog EXTRA "Checking installed headers" + CT_DoExecLog ALL \ + make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" \ + O=$(pwd) \ + ARCH=${CT_KERNEL_ARCH} \ + INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \ + ${V_OPT} \ + headers_check + find "${CT_SYSROOT_DIR}" -type f -name '.check*' -exec rm {} \; + fi +} + +# 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.lzma) tar_opt=--lzma;; + 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 +} diff --git a/scripts/build/kernel/uclinux.sh b/scripts/build/kernel/uclinux.sh deleted file mode 100644 index 0401c9ff..00000000 --- a/scripts/build/kernel/uclinux.sh +++ /dev/null @@ -1 +0,0 @@ -. ${CT_LIB_DIR}/scripts/build/kernel/linux-common.sh diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 49b0aff1..a2032bc4 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -91,7 +91,8 @@ CT_DoLog INFO "Building environment variables" . "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh" . "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh" . "${CT_LIB_DIR}/scripts/build/companion_libs/ppl.sh" -. "${CT_LIB_DIR}/scripts/build/binutils.sh" +. "${CT_LIB_DIR}/scripts/build/binutils/binutils.sh" +. "${CT_LIB_DIR}/scripts/build/binutils/elf2flt.sh" . "${CT_LIB_DIR}/scripts/build/libc/${CT_LIBC}.sh" . "${CT_LIB_DIR}/scripts/build/cc/${CT_CC}.sh" . "${CT_LIB_DIR}/scripts/build/tools.sh" -- cgit v1.2.3