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.

10 files changed, 79 insertions, 8 deletions

diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh
index 7615963f..30110067 100644
--- a/scripts/build/binutils.sh
+++ b/scripts/build/binutils.sh
@@ -2,6 +2,10 @@
 # Copyright 2007 Yann E. MORIN
 # Licensed under the GPL v2. See COPYING in the root of this package
 
+do_print_filename() {
+    echo "${CT_BINUTILS_FILE}"
+}
+
 # Download binutils
 do_binutils_get() {
     CT_GetFile "${CT_BINUTILS_FILE}"                            \
diff --git a/scripts/build/cc_core_gcc.sh b/scripts/build/cc_core_gcc.sh
index 20f12407..52db1d3f 100644
--- a/scripts/build/cc_core_gcc.sh
+++ b/scripts/build/cc_core_gcc.sh
@@ -2,6 +2,11 @@
 # Copyright 2007 Yann E. MORIN
 # Licensed under the GPL v2. See COPYING in the root of this package
 
+do_print_filename() {
+    [ "${CT_CC_CORE}" = "gcc" ] || return 0
+    echo "${CT_CC_CORE_FILE}"
+}
+
 # Download core gcc
 do_cc_core_get() {
     # Ah! gcc folks are kind of 'different': they store the tarballs in
diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh
index 82dd2a31..0b24f830 100644
--- a/scripts/build/cc_gcc.sh
+++ b/scripts/build/cc_gcc.sh
@@ -2,6 +2,11 @@
 # 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 "${CT_CC_FILE}"
+}
+
 # Download final gcc
 do_cc_get() {
     # Ah! gcc folks are kind of 'different': they store the tarballs in
diff --git a/scripts/build/debug/dmalloc.sh b/scripts/build/debug/dmalloc.sh
index 075035c3..039f1ead 100644
--- a/scripts/build/debug/dmalloc.sh
+++ b/scripts/build/debug/dmalloc.sh
@@ -2,6 +2,11 @@
 
 is_enabled="${CT_DMALLOC}"
 
+do_print_filename() {
+    [ "${CT_DMALLOC}" = "y" ] || return 0
+    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/gdb.sh b/scripts/build/debug/gdb.sh
index e1f6de56..55c7c543 100644
--- a/scripts/build/debug/gdb.sh
+++ b/scripts/build/debug/gdb.sh
@@ -2,6 +2,11 @@
 
 is_enabled="${CT_GDB}"
 
+do_print_filename() {
+    [ "${CT_GDB}" = "y" ] || return 0
+    echo "gdb`do_debug_gdb_suffix`"
+}
+
 do_debug_gdb_suffix() {
     case "${CT_GDB_VERSION}" in
         snapshot)   ;;
diff --git a/scripts/build/kernel_linux.sh b/scripts/build/kernel_linux.sh
index 8c0c7ef8..f779505d 100644
--- a/scripts/build/kernel_linux.sh
+++ b/scripts/build/kernel_linux.sh
@@ -2,6 +2,11 @@
 # Copyright 2007 Yann E. MORIN
 # Licensed under the GPL v2. See COPYING in the root of this package
 
+do_print_filename() {
+    [ "${CT_KERNEL}" = "linux" ] || return 0
+    echo "${CT_KERNEL_FILE}"
+}
+
 # Download the kernel
 do_kernel_get() {
     if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
diff --git a/scripts/build/libc_glibc.sh b/scripts/build/libc_glibc.sh
index d6b9049e..5474cda8 100644
--- a/scripts/build/libc_glibc.sh
+++ b/scripts/build/libc_glibc.sh
@@ -2,6 +2,16 @@
 # 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 "${CT_LIBC_FILE}"
+    for addon in `do_libc_add_ons_list " "`; do
+        # NPTL addon is not to be downloaded, in any case
+        [ "${addon}" = "nptl" ] && continue || true
+        echo "${CT_LIBC}-${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_uClibc.sh b/scripts/build/libc_uClibc.sh
index 632db69b..cf434b09 100644
--- a/scripts/build/libc_uClibc.sh
+++ b/scripts/build/libc_uClibc.sh
@@ -2,6 +2,12 @@
 # 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 "${CT_LIBC_FILE}"
+    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && echo "uClibc-locale-030818" || true
+}
+
 # Download uClibc
 do_libc_get() {
 	libc_src="http://www.uclibc.org/downloads
@@ -12,7 +18,7 @@ do_libc_get() {
     # later...
     CT_GetFile "${CT_LIBC_FILE}" ${libc_src}
     # uClibc locales
-    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src}
+    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src} || true
 
     return 0
 }
@@ -21,7 +27,7 @@ do_libc_get() {
 do_libc_extract() {
     CT_ExtractAndPatch "${CT_LIBC_FILE}"
     # uClibc locales
-    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818"
+    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818" || true
 
     return 0
 }
diff --git a/scripts/build/libfloat.sh b/scripts/build/libfloat.sh
index ee3c119e..20613efd 100644
--- a/scripts/build/libfloat.sh
+++ b/scripts/build/libfloat.sh
@@ -5,6 +5,10 @@
 # Define libfloat functions depending on wether it is selected or not
 if [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ]; then
 
+do_print_filename() {
+    echo "${CT_LIBFLOAT_FILE}"
+}
+
 # Download libfloat
 do_libfloat_get() {
     # Ah! libfloat separates the version string from the base name with
@@ -14,7 +18,7 @@ do_libfloat_get() {
                ftp://ftp.de.debian.org/debian/pool/main/libf/libfloat
     CT_Pushd "${CT_TARBALLS_DIR}"
     ext=`CT_GetFileExtension "${libfloat_file}"`
-    ln -svf "${libfloat_file}${ext}" "${CT_LIBFLOAT_FILE}${ext}" |CT_DoLog DEBUG
+    ln -vf "${libfloat_file}${ext}" "${CT_LIBFLOAT_FILE}${ext}" |CT_DoLog DEBUG
     CT_Popd
 }
 
@@ -52,6 +56,9 @@ do_libfloat() {
 
 else # "${CT_ARCH_FLOAT_SW_LIBFLOAT}" != "y"
 
+do_print_filename() {
+    true
+}
 do_libfloat_get() {
     true
 }
diff --git a/scripts/build/tools/sstrip.sh b/scripts/build/tools/sstrip.sh
index 5555451e..f2749971 100644
--- a/scripts/build/tools/sstrip.sh
+++ b/scripts/build/tools/sstrip.sh
@@ -4,6 +4,9 @@ is_enabled="${CT_SSTRIP}"
 
 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,16 +32,17 @@ case "${CT_SSTRIP_FROM}" in
 
     buildroot)
         sstrip_url='http://buildroot.uclibc.org/cgi-bin/viewcvs.cgi/trunk/buildroot/toolchain/sstrip/sstrip.c'
+        do_print_filename() {
+            echo "sstrip.c"
+        }
         do_tools_sstrip_get() {
             # With this one, we must handle the download by ourselves,
             # we can't leave the job to the classic CT_GetFile.
-            if [ -f "${CT_SRC_DIR}/sstrip/sstrip.c" ]; then
+            if [ -f "${CT_TARBALLS_DIR}/sstrip.c" ]; then
                 return 0
             fi
-            CT_Pushd "${CT_SRC_DIR}"
+            CT_Pushd "${CT_TARBALLS_DIR}"
             CT_DoLog EXTRA "Retrieving \"sstrip\" (from buildroot's svn)"
-            mkdir -p sstrip
-            cd sstrip
             http_data=`lynx -dump "${sstrip_url}"`
             link=`echo -en "${http_data}"                           \
                   |egrep '\[[[:digit:]]+\]download'                 \
@@ -52,7 +56,8 @@ case "${CT_SSTRIP_FROM}" in
         }
         do_tools_sstrip_extract() {
             # We'll let buildroot guys take care of sstrip maintenance and patching.
-            :
+            mkdir -p "${CT_SRC_DIR}/sstrip"
+            cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip" |CT_DoLog ALL
         }
         do_tools_sstrip_build() {
             CT_DoStep INFO "Installing sstrip"
@@ -68,4 +73,18 @@ case "${CT_SSTRIP_FROM}" in
             CT_EndStep
         }
     ;;
+
+    *)  do_print_filename() {
+            :
+        }
+        do_tools_sstrip_get() {
+            :
+        }
+        do_tools_sstrip_extract() {
+            :
+        }
+        do_tools_sstrip_build() {
+            :
+        }
+    ;;
 esac