From b8b7843bea8f636d72540a9debfcc8e524b5d4fe Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 3 Jan 2009 21:11:41 +0000 Subject: Get rid of all stuff related to building a /delivery' traball: - building a delivery tarball has long been broken (since crostool-Ng is installable) - get rid of implied do_print_filename, that can be mis-leading now tarballs can not be built /trunk/scripts/build/kernel/bare-metal.sh | 4 0 4 0 ---- /trunk/scripts/build/kernel/linux.sh | 4 0 4 0 ---- /trunk/scripts/build/tools/000-template.sh | 11 0 11 0 ----------- /trunk/scripts/build/tools/100-libelf.sh | 4 0 4 0 ---- /trunk/scripts/build/tools/200-sstrip.sh | 11 1 10 0 +---------- /trunk/scripts/build/binutils.sh | 4 0 4 0 ---- /trunk/scripts/build/cc/gcc.sh | 5 0 5 0 ----- /trunk/scripts/build/debug/000-template.sh | 11 0 11 0 ----------- /trunk/scripts/build/debug/100-dmalloc.sh | 4 0 4 0 ---- /trunk/scripts/build/debug/400-ltrace.sh | 4 0 4 0 ---- /trunk/scripts/build/debug/300-gdb.sh | 7 0 7 0 ------- /trunk/scripts/build/debug/500-strace.sh | 4 0 4 0 ---- /trunk/scripts/build/debug/200-duma.sh | 4 0 4 0 ---- /trunk/scripts/build/libc/none.sh | 5 0 5 0 ----- /trunk/scripts/build/libc/glibc.sh | 10 0 10 0 ---------- /trunk/scripts/build/libc/uClibc.sh | 6 0 6 0 ------ /trunk/scripts/build/libc/eglibc.sh | 10 0 10 0 ---------- /trunk/scripts/build/gmp.sh | 6 0 6 0 ------ /trunk/scripts/build/mpfr.sh | 6 0 6 0 ------ /trunk/docs/overview.txt | 9 0 9 0 --------- 20 files changed, 1 insertion(+), 128 deletions(-) diff --git a/docs/overview.txt b/docs/overview.txt index 22a6610..4ca7c54 100644 --- a/docs/overview.txt +++ b/docs/overview.txt @@ -741,15 +741,6 @@ The kernel's ".sh" file API: target tuple + return value: ignored - > defines the function "do_print_filename": - + parameters: none - + environment: - - all variables from the ".config" file, - + return value: ignored - + behavior: output the kernel's tarball filename, with adequate suffix, - on stdout. - Eg.: linux-2.6.26.5.tar.bz2 - > defines the function "do_kernel_get": + parameters: none + environment: diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh index 9cf99af..fe8d2d9 100644 --- a/scripts/build/binutils.sh +++ b/scripts/build/binutils.sh @@ -2,10 +2,6 @@ # Copyright 2007 Yann E. MORIN # Licensed under the GPL v2. See COPYING in the root of this package -do_print_filename() { - echo "binutils-${CT_BINUTILS_VERSION}" -} - # Download binutils do_binutils_get() { CT_GetFile "${CT_BINUTILS_FILE}" \ diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 5f8ad55..734b3b7 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -2,11 +2,6 @@ # Copyright 2007 Yann E. MORIN # Licensed under the GPL v2. See COPYING in the root of this package -do_print_filename() { - [ "${CT_CC}" = "gcc" ] || return 0 - echo "gcc-${CT_CC_VERSION}" -} - # Download gcc do_cc_get() { # Ah! gcc folks are kind of 'different': they store the tarballs in diff --git a/scripts/build/debug/000-template.sh b/scripts/build/debug/000-template.sh index b6eaa9a..c5fba91 100644 --- a/scripts/build/debug/000-template.sh +++ b/scripts/build/debug/000-template.sh @@ -1,16 +1,5 @@ # Template file for a debug utility -# Small function to print the filename -# Note that this function gets redefined over and over for each tool -# It's of no use when building the toolchain proper, but shows all its -# usefullness when saving the toolchain and building the tarball. -# Echo the name of the file, without the extension, below. -do_print_filename() { - # For example: - # echo "foobar-${CT_FOOBAR_VERSION}" - : -} - # Put your download code here do_debug_foobar_get() { # For example: diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh index 371c5cd..27a70a8 100644 --- a/scripts/build/debug/100-dmalloc.sh +++ b/scripts/build/debug/100-dmalloc.sh @@ -1,9 +1,5 @@ # Build script for the dmalloc debug library facility -do_print_filename() { - echo "dmalloc-${CT_DMALLOC_VERSION}" -} - do_debug_dmalloc_get() { CT_GetFile "dmalloc-${CT_DMALLOC_VERSION}" http://dmalloc.com/releases/ } diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index 79d09fe..bdb92a6 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -1,9 +1,5 @@ # Build script for D.U.M.A. -do_print_filename() { - echo "duma_${CT_DUMA_VERSION}" -} - do_debug_duma_get() { CT_GetFile "duma_${CT_DUMA_VERSION}" http://mesh.dl.sourceforge.net/sourceforge/duma/ # D.U.M.A. doesn't separate its name from its version with a dash, diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 321e13a..c2a964e 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -1,12 +1,5 @@ # Build script for the gdb debug facility -do_print_filename() { - echo "gdb$(do_debug_gdb_suffix)" - if [ "${CT_GDB_NATIVE}" = "y" ]; then - echo "ncurses-${CT_NCURSES_VERSION}" - fi -} - do_debug_gdb_suffix() { case "${CT_GDB_VERSION}" in snapshot) ;; diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 8d8e1cb..231a61f 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -1,9 +1,5 @@ # Build script for ltrace -do_print_filename() { - echo "ltrace-${CT_LTRACE_VERSION}.orig" -} - do_debug_ltrace_get() { CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" {ftp,http}://ftp.de.debian.org/debian/pool/main/l/ltrace/ # Create a link so that the following steps are easier to do: diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index ee1fc2c..8e3c682 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -1,9 +1,5 @@ # Build script for strace -do_print_filename() { - echo "strace-${CT_STRACE_VERSION}" -} - do_debug_strace_get() { CT_GetFile "strace-${CT_STRACE_VERSION}" http://mesh.dl.sourceforge.net/sourceforge/strace/ # Downloading from sourceforge leaves garbage, cleanup diff --git a/scripts/build/gmp.sh b/scripts/build/gmp.sh index e652155..9eae882 100644 --- a/scripts/build/gmp.sh +++ b/scripts/build/gmp.sh @@ -2,7 +2,6 @@ # Copyright 2008 Yann E. MORIN # Licensed under the GPL v2. See COPYING in the root of this package -do_print_filename() { :; } do_gmp_get() { :; } do_gmp_extract() { :; } do_gmp() { :; } @@ -11,11 +10,6 @@ do_gmp_target() { :; } # Overide functions depending on configuration if [ "${CT_GMP_MPFR}" = "y" ]; then -do_print_filename() { - [ "${CT_GMP_MPFR}" = "y" ] || return 0 - echo "gmp-${CT_GMP_VERSION}" -} - # Download GMP do_gmp_get() { CT_GetFile "${CT_GMP_FILE}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp diff --git a/scripts/build/kernel/bare-metal.sh b/scripts/build/kernel/bare-metal.sh index be83d16..629f63f 100644 --- a/scripts/build/kernel/bare-metal.sh +++ b/scripts/build/kernel/bare-metal.sh @@ -7,10 +7,6 @@ CT_DoKernelTupleValues() { CT_TARGET_KERNEL= } -do_print_filename() { - : -} - do_kernel_get() { : } diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index 0c8b199..35f5dee 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -7,10 +7,6 @@ CT_DoKernelTupleValues() { : } -do_print_filename() { - echo "linux-${CT_KERNEL_VERSION}" -} - # Download the kernel do_kernel_get() { if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh index 6c08cdb..01f8ceb 100644 --- a/scripts/build/libc/eglibc.sh +++ b/scripts/build/libc/eglibc.sh @@ -1,15 +1,5 @@ # eglibc build functions (initially by Thomas JOURDAN). -do_print_filename() { - [ "${CT_LIBC}" = "eglibc" ] || return 0 - echo "eglibc-${CT_LIBC_VERSION}" - for addon in $(do_libc_add_ons_list " "); do - # NPTL addon is not to be downloaded, in any case - [ "${addon}" = "nptl" ] && continue || true - echo "eglibc-${addon}-${CT_LIBC_VERSION}" - done -} - # Download eglibc repository do_eglibc_get() { CT_HasOrAbort svn diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index b9eb631..e43d37b 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -2,16 +2,6 @@ # Copyright 2007 Yann E. MORIN # Licensed under the GPL v2. See COPYING in the root of this package -do_print_filename() { - [ "${CT_LIBC}" = "glibc" ] || return 0 - echo "glibc-${CT_LIBC_VERSION}" - for addon in $(do_libc_add_ons_list " "); do - # NPTL addon is not to be downloaded, in any case - [ "${addon}" = "nptl" ] && continue || true - echo "glibc-${addon}-${CT_LIBC_VERSION}" - done -} - # Download glibc do_libc_get() { # Ah! Not all GNU folks seem stupid. All glibc releases are in the same diff --git a/scripts/build/libc/none.sh b/scripts/build/libc/none.sh index 4053459..520b8fd 100644 --- a/scripts/build/libc/none.sh +++ b/scripts/build/libc/none.sh @@ -2,10 +2,6 @@ # Copyright 2008 Yann E. MORIN # Licensed under the GPL v2. See COPYING in the root of this package -do_print_filename() { - : -} - do_libc_get() { : } @@ -22,7 +18,6 @@ do_libc_headers() { : } -# Build and install start files do_libc_start_files() { : } diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index ec9cc52..6b46d30 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -2,12 +2,6 @@ # Copyright 2007 Yann E. MORIN # Licensed under the GPL v2. See COPYING in the root of this package -do_print_filename() { - [ "${CT_LIBC}" = "uClibc" ] || return 0 - echo "uClibc-${CT_LIBC_VERSION}" - [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && echo "uClibc-locale-030818" || true -} - # Download uClibc do_libc_get() { libc_src="http://www.uclibc.org/downloads diff --git a/scripts/build/mpfr.sh b/scripts/build/mpfr.sh index a7c6d72..0d865f8 100644 --- a/scripts/build/mpfr.sh +++ b/scripts/build/mpfr.sh @@ -2,7 +2,6 @@ # Copyright 2008 Yann E. MORIN # Licensed under the GPL v2. See COPYING in the root of this package -do_print_filename() { :; } do_mpfr_get() { :; } do_mpfr_extract() { :; } do_mpfr() { :; } @@ -11,11 +10,6 @@ do_mpfr_target() { :; } # Overide function depending on configuration if [ "${CT_GMP_MPFR}" = "y" ]; then -do_print_filename() { - [ "${CT_GMP_MPFR}" = "y" ] || return 0 - echo "mpfr-${CT_MPFR_VERSION}" -} - # Download MPFR do_mpfr_get() { CT_GetFile "${CT_MPFR_FILE}" http://www.mpfr.org/mpfr-current/ \ diff --git a/scripts/build/tools/000-template.sh b/scripts/build/tools/000-template.sh index 4a27801..23c9575 100644 --- a/scripts/build/tools/000-template.sh +++ b/scripts/build/tools/000-template.sh @@ -1,16 +1,5 @@ # Template file for a tool utility -# Small function to print the filename -# Note that this function gets redefined over and over again for each tool. -# It's of no use when building the toolchain proper, but shows all its -# usefullness when saving the toolchain and building the tarball. -# Echo the name of the file, without the extension, below. -do_print_filename() { - # For example: - # echo "foobar-${CT_FOOBAR_VERSION}" - : -} - # Put your download code here do_tools_foobar_get() { # For example: diff --git a/scripts/build/tools/100-libelf.sh b/scripts/build/tools/100-libelf.sh index e8cd986..b82e3cf 100644 --- a/scripts/build/tools/100-libelf.sh +++ b/scripts/build/tools/100-libelf.sh @@ -1,9 +1,5 @@ # Build script for libelf -do_print_filename() { - echo "libelf-${CT_LIBELF_VERSION}" -} - do_tools_libelf_get() { # The server hosting libelf will return an "HTTP 300 : Multiple Choices" # error code if we try to download a file that does not exists there. diff --git a/scripts/build/tools/200-sstrip.sh b/scripts/build/tools/200-sstrip.sh index fd7812a..9009075 100644 --- a/scripts/build/tools/200-sstrip.sh +++ b/scripts/build/tools/200-sstrip.sh @@ -2,9 +2,6 @@ case "${CT_SSTRIP_FROM}" in ELFkickers) - do_print_filename() { - echo "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}" - } do_tools_sstrip_get() { CT_GetFile "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}" \ http://www.muppetlabs.com/~breadbox/pub/software @@ -29,9 +26,6 @@ case "${CT_SSTRIP_FROM}" in ;; buildroot) - do_print_filename() { - echo "sstrip.c" - } do_tools_sstrip_get() { # Note: the space between sstrip and .c is on purpose. CT_GetFile sstrip .c \ @@ -57,10 +51,7 @@ case "${CT_SSTRIP_FROM}" in } ;; - *) do_print_filename() { - : - } - do_tools_sstrip_get() { + *) do_tools_sstrip_get() { : } do_tools_sstrip_extract() { diff --git a/scripts/tarball.sh.broken b/scripts/tarball.sh.broken deleted file mode 100755 index c26ac0a..0000000 --- a/scripts/tarball.sh.broken +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -# This scripts makes a tarball of the configured toolchain -# Pre-requisites: -# - crosstool-NG is configured -# - components tarball are available -# - toolchain is built successfully - -# We need the functions first: -. "${CT_TOP_DIR}/scripts/functions" - -# Don't care about any log file -exec >/dev/null -rm -f "${tmp_log_file}" - -# Parse the configuration file: -. ${CT_TOP_DIR}/.config - -# Parse the architecture-specific functions -. "${CT_LIB_DIR}/arch/${CT_ARCH}/functions" - -# Target tuple: CT_TARGET needs a little love: -CT_DoBuildTargetTuple - -# Kludge: if any of the config options needs either CT_TARGET or CT_TOP_DIR, -# re-parse them: -. "${CT_TOP_DIR}/.config" - -# Build a one-line list of files to include -CT_DoStep DEBUG "Building list of tarballs to add" -CT_TARBALLS_DIR="${CT_TOP_DIR}/targets/tarballs" -CT_TARBALLS="" -for dir in '' tools debug; do - CT_DoStep DEBUG "Scanning directory '${dir}'" - for script in "${CT_TOP_DIR}/scripts/build/${dir}/"*.sh; do - CT_DoStep DEBUG "Testing component '${script}'" - [ -n "${script}" ] || continue - unset do_print_file_name - . "${script}" - for file in $(do_print_filename); do - CT_DoLog DEBUG "Finding tarball for '${file}'" - [ -n "${file}" ] || continue - ext=$(CT_GetFileExtension "${file}") - CT_TestOrAbort "Missing tarball for: '${file}'" -f "${CT_TOP_DIR}/targets/tarballs/${file}${ext}" - CT_DoLog DEBUG "Found '${file}${ext}'" - CT_TARBALLS="${CT_TARBALLS} ${file}${ext}" - done - CT_EndStep - done - CT_EndStep -done -CT_EndStep - -# We need to emulate a build directory: -CT_BUILD_DIR="${CT_TOP_DIR}/targets/${CT_TARGET}/build" -mkdir -p "${CT_BUILD_DIR}" -CT_MktempDir tempdir - -# Save crosstool-NG, as it is configured for the current toolchain. -topdir=$(basename "${CT_TOP_DIR}") -CT_Pushd "${CT_TOP_DIR}/.." - -botdir=$(pwd) - -# Build the list of files to exclude -CT_DoLog DEBUG "Building list of files to exclude" -exclude_list="${tempdir}/${CT_TARGET}.list" -{ echo ".svn"; \ - echo "${topdir}/log.*"; \ - echo "${topdir}/targets/src"; \ - echo "${topdir}/targets/tst"; \ - echo "${topdir}/targets/*-*-*-*"; \ - for t in $(ls -1 "${topdir}/targets/tarballs/"); do \ - case " ${CT_TARBALLS} " in \ - *" ${t} "*) ;; \ - *) echo "${topdir}/targets/tarballs/${t}";; \ - esac; \ - done; \ -} >"${exclude_list}" - -# Render the install directory writable -chmod u+w "${CT_PREFIX_DIR}" - -CT_DoLog INFO "Saving crosstool-NG into the toolchain directory" -tar cvjf "${CT_PREFIX_DIR}/${topdir}.${CT_TARGET}.tar.bzip2" \ - --no-wildcards-match-slash \ - -X "${exclude_list}" \ - "${topdir}" 2>&1 |CT_DoLog ALL - -CT_Popd - -CT_DoLog INFO "Saving the toolchain" -tar cvjf "${botdir}/${CT_TARGET}.tar.bz2" "${CT_PREFIX_DIR}" 2>&1 |CT_DoLog ALL - -CT_DoLog DEBUG "Getting rid of working directories" -rm -f "${CT_PREFIX_DIR}/${topdir}.${CT_TARGET}.tar.bzip2" -rm -rf "${tempdir}" - -if [ "${CT_INSTALL_DIR_RO}" = "y" ]; then - # Render the install directory non-writable - chmod u-w "${CT_PREFIX_DIR}" -fi -- cgit v0.10.2-6-g49f6