Add a function to print each component's filename: this eases building the tarball of the generated toolchain.
Hard-link the libfloat tarball instead of soft-link: this also eases building the afore-mentioned tarball.
1.1 --- a/scripts/build/binutils.sh Sat Jun 16 18:04:05 2007 +0000
1.2 +++ b/scripts/build/binutils.sh Sat Jun 16 18:08:14 2007 +0000
1.3 @@ -2,6 +2,10 @@
1.4 # Copyright 2007 Yann E. MORIN
1.5 # Licensed under the GPL v2. See COPYING in the root of this package
1.6
1.7 +do_print_filename() {
1.8 + echo "${CT_BINUTILS_FILE}"
1.9 +}
1.10 +
1.11 # Download binutils
1.12 do_binutils_get() {
1.13 CT_GetFile "${CT_BINUTILS_FILE}" \
2.1 --- a/scripts/build/cc_core_gcc.sh Sat Jun 16 18:04:05 2007 +0000
2.2 +++ b/scripts/build/cc_core_gcc.sh Sat Jun 16 18:08:14 2007 +0000
2.3 @@ -2,6 +2,11 @@
2.4 # Copyright 2007 Yann E. MORIN
2.5 # Licensed under the GPL v2. See COPYING in the root of this package
2.6
2.7 +do_print_filename() {
2.8 + [ "${CT_CC_CORE}" = "gcc" ] || return 0
2.9 + echo "${CT_CC_CORE_FILE}"
2.10 +}
2.11 +
2.12 # Download core gcc
2.13 do_cc_core_get() {
2.14 # Ah! gcc folks are kind of 'different': they store the tarballs in
3.1 --- a/scripts/build/cc_gcc.sh Sat Jun 16 18:04:05 2007 +0000
3.2 +++ b/scripts/build/cc_gcc.sh Sat Jun 16 18:08:14 2007 +0000
3.3 @@ -2,6 +2,11 @@
3.4 # Copyright 2007 Yann E. MORIN
3.5 # Licensed under the GPL v2. See COPYING in the root of this package
3.6
3.7 +do_print_filename() {
3.8 + [ "${CT_CC}" = "gcc" ] || return 0
3.9 + echo "${CT_CC_FILE}"
3.10 +}
3.11 +
3.12 # Download final gcc
3.13 do_cc_get() {
3.14 # Ah! gcc folks are kind of 'different': they store the tarballs in
4.1 --- a/scripts/build/debug/dmalloc.sh Sat Jun 16 18:04:05 2007 +0000
4.2 +++ b/scripts/build/debug/dmalloc.sh Sat Jun 16 18:08:14 2007 +0000
4.3 @@ -2,6 +2,11 @@
4.4
4.5 is_enabled="${CT_DMALLOC}"
4.6
4.7 +do_print_filename() {
4.8 + [ "${CT_DMALLOC}" = "y" ] || return 0
4.9 + echo "dmalloc-${CT_DMALLOC_VERSION}"
4.10 +}
4.11 +
4.12 do_debug_dmalloc_get() {
4.13 CT_GetFile "dmalloc-${CT_DMALLOC_VERSION}" http://dmalloc.com/releases/
4.14 }
5.1 --- a/scripts/build/debug/gdb.sh Sat Jun 16 18:04:05 2007 +0000
5.2 +++ b/scripts/build/debug/gdb.sh Sat Jun 16 18:08:14 2007 +0000
5.3 @@ -2,6 +2,11 @@
5.4
5.5 is_enabled="${CT_GDB}"
5.6
5.7 +do_print_filename() {
5.8 + [ "${CT_GDB}" = "y" ] || return 0
5.9 + echo "gdb`do_debug_gdb_suffix`"
5.10 +}
5.11 +
5.12 do_debug_gdb_suffix() {
5.13 case "${CT_GDB_VERSION}" in
5.14 snapshot) ;;
6.1 --- a/scripts/build/kernel_linux.sh Sat Jun 16 18:04:05 2007 +0000
6.2 +++ b/scripts/build/kernel_linux.sh Sat Jun 16 18:08:14 2007 +0000
6.3 @@ -2,6 +2,11 @@
6.4 # Copyright 2007 Yann E. MORIN
6.5 # Licensed under the GPL v2. See COPYING in the root of this package
6.6
6.7 +do_print_filename() {
6.8 + [ "${CT_KERNEL}" = "linux" ] || return 0
6.9 + echo "${CT_KERNEL_FILE}"
6.10 +}
6.11 +
6.12 # Download the kernel
6.13 do_kernel_get() {
6.14 if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
7.1 --- a/scripts/build/libc_glibc.sh Sat Jun 16 18:04:05 2007 +0000
7.2 +++ b/scripts/build/libc_glibc.sh Sat Jun 16 18:08:14 2007 +0000
7.3 @@ -2,6 +2,16 @@
7.4 # Copyright 2007 Yann E. MORIN
7.5 # Licensed under the GPL v2. See COPYING in the root of this package
7.6
7.7 +do_print_filename() {
7.8 + [ "${CT_LIBC}" = "glibc" ] || return 0
7.9 + echo "${CT_LIBC_FILE}"
7.10 + for addon in `do_libc_add_ons_list " "`; do
7.11 + # NPTL addon is not to be downloaded, in any case
7.12 + [ "${addon}" = "nptl" ] && continue || true
7.13 + echo "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
7.14 + done
7.15 +}
7.16 +
7.17 # Download glibc
7.18 do_libc_get() {
7.19 # Ah! Not all GNU folks seem stupid. All glibc releases are in the same
8.1 --- a/scripts/build/libc_uClibc.sh Sat Jun 16 18:04:05 2007 +0000
8.2 +++ b/scripts/build/libc_uClibc.sh Sat Jun 16 18:08:14 2007 +0000
8.3 @@ -2,6 +2,12 @@
8.4 # Copyright 2007 Yann E. MORIN
8.5 # Licensed under the GPL v2. See COPYING in the root of this package
8.6
8.7 +do_print_filename() {
8.8 + [ "${CT_LIBC}" = "uClibc" ] || return 0
8.9 + echo "${CT_LIBC_FILE}"
8.10 + [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && echo "uClibc-locale-030818" || true
8.11 +}
8.12 +
8.13 # Download uClibc
8.14 do_libc_get() {
8.15 libc_src="http://www.uclibc.org/downloads
8.16 @@ -12,7 +18,7 @@
8.17 # later...
8.18 CT_GetFile "${CT_LIBC_FILE}" ${libc_src}
8.19 # uClibc locales
8.20 - [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src}
8.21 + [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src} || true
8.22
8.23 return 0
8.24 }
8.25 @@ -21,7 +27,7 @@
8.26 do_libc_extract() {
8.27 CT_ExtractAndPatch "${CT_LIBC_FILE}"
8.28 # uClibc locales
8.29 - [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818"
8.30 + [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818" || true
8.31
8.32 return 0
8.33 }
9.1 --- a/scripts/build/libfloat.sh Sat Jun 16 18:04:05 2007 +0000
9.2 +++ b/scripts/build/libfloat.sh Sat Jun 16 18:08:14 2007 +0000
9.3 @@ -5,6 +5,10 @@
9.4 # Define libfloat functions depending on wether it is selected or not
9.5 if [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ]; then
9.6
9.7 +do_print_filename() {
9.8 + echo "${CT_LIBFLOAT_FILE}"
9.9 +}
9.10 +
9.11 # Download libfloat
9.12 do_libfloat_get() {
9.13 # Ah! libfloat separates the version string from the base name with
9.14 @@ -14,7 +18,7 @@
9.15 ftp://ftp.de.debian.org/debian/pool/main/libf/libfloat
9.16 CT_Pushd "${CT_TARBALLS_DIR}"
9.17 ext=`CT_GetFileExtension "${libfloat_file}"`
9.18 - ln -svf "${libfloat_file}${ext}" "${CT_LIBFLOAT_FILE}${ext}" |CT_DoLog DEBUG
9.19 + ln -vf "${libfloat_file}${ext}" "${CT_LIBFLOAT_FILE}${ext}" |CT_DoLog DEBUG
9.20 CT_Popd
9.21 }
9.22
9.23 @@ -52,6 +56,9 @@
9.24
9.25 else # "${CT_ARCH_FLOAT_SW_LIBFLOAT}" != "y"
9.26
9.27 +do_print_filename() {
9.28 + true
9.29 +}
9.30 do_libfloat_get() {
9.31 true
9.32 }
10.1 --- a/scripts/build/tools/sstrip.sh Sat Jun 16 18:04:05 2007 +0000
10.2 +++ b/scripts/build/tools/sstrip.sh Sat Jun 16 18:08:14 2007 +0000
10.3 @@ -4,6 +4,9 @@
10.4
10.5 case "${CT_SSTRIP_FROM}" in
10.6 ELFkickers)
10.7 + do_print_filename() {
10.8 + echo "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}"
10.9 + }
10.10 do_tools_sstrip_get() {
10.11 CT_GetFile "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}" \
10.12 http://www.muppetlabs.com/~breadbox/pub/software
10.13 @@ -29,16 +32,17 @@
10.14
10.15 buildroot)
10.16 sstrip_url='http://buildroot.uclibc.org/cgi-bin/viewcvs.cgi/trunk/buildroot/toolchain/sstrip/sstrip.c'
10.17 + do_print_filename() {
10.18 + echo "sstrip.c"
10.19 + }
10.20 do_tools_sstrip_get() {
10.21 # With this one, we must handle the download by ourselves,
10.22 # we can't leave the job to the classic CT_GetFile.
10.23 - if [ -f "${CT_SRC_DIR}/sstrip/sstrip.c" ]; then
10.24 + if [ -f "${CT_TARBALLS_DIR}/sstrip.c" ]; then
10.25 return 0
10.26 fi
10.27 - CT_Pushd "${CT_SRC_DIR}"
10.28 + CT_Pushd "${CT_TARBALLS_DIR}"
10.29 CT_DoLog EXTRA "Retrieving \"sstrip\" (from buildroot's svn)"
10.30 - mkdir -p sstrip
10.31 - cd sstrip
10.32 http_data=`lynx -dump "${sstrip_url}"`
10.33 link=`echo -en "${http_data}" \
10.34 |egrep '\[[[:digit:]]+\]download' \
10.35 @@ -52,7 +56,8 @@
10.36 }
10.37 do_tools_sstrip_extract() {
10.38 # We'll let buildroot guys take care of sstrip maintenance and patching.
10.39 - :
10.40 + mkdir -p "${CT_SRC_DIR}/sstrip"
10.41 + cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip" |CT_DoLog ALL
10.42 }
10.43 do_tools_sstrip_build() {
10.44 CT_DoStep INFO "Installing sstrip"
10.45 @@ -68,4 +73,18 @@
10.46 CT_EndStep
10.47 }
10.48 ;;
10.49 +
10.50 + *) do_print_filename() {
10.51 + :
10.52 + }
10.53 + do_tools_sstrip_get() {
10.54 + :
10.55 + }
10.56 + do_tools_sstrip_extract() {
10.57 + :
10.58 + }
10.59 + do_tools_sstrip_build() {
10.60 + :
10.61 + }
10.62 + ;;
10.63 esac