Fix printing components' file names.
1.1 --- a/scripts/build/binutils.sh Sat Jun 16 20:47:58 2007 +0000
1.2 +++ b/scripts/build/binutils.sh Sat Jun 16 21:44:45 2007 +0000
1.3 @@ -3,7 +3,7 @@
1.4 # Licensed under the GPL v2. See COPYING in the root of this package
1.5
1.6 do_print_filename() {
1.7 - echo "${CT_BINUTILS_FILE}"
1.8 + echo "binutils-${CT_BINUTILS_VERSION}"
1.9 }
1.10
1.11 # Download binutils
2.1 --- a/scripts/build/cc_core_gcc.sh Sat Jun 16 20:47:58 2007 +0000
2.2 +++ b/scripts/build/cc_core_gcc.sh Sat Jun 16 21:44:45 2007 +0000
2.3 @@ -4,7 +4,7 @@
2.4
2.5 do_print_filename() {
2.6 [ "${CT_CC_CORE}" = "gcc" ] || return 0
2.7 - echo "${CT_CC_CORE_FILE}"
2.8 + echo "gcc-${CT_CC_CORE_VERSION}"
2.9 }
2.10
2.11 # Download core gcc
3.1 --- a/scripts/build/cc_gcc.sh Sat Jun 16 20:47:58 2007 +0000
3.2 +++ b/scripts/build/cc_gcc.sh Sat Jun 16 21:44:45 2007 +0000
3.3 @@ -4,7 +4,7 @@
3.4
3.5 do_print_filename() {
3.6 [ "${CT_CC}" = "gcc" ] || return 0
3.7 - echo "${CT_CC_FILE}"
3.8 + echo "gcc-${CT_CC_VERSION}"
3.9 }
3.10
3.11 # Download final gcc
4.1 --- a/scripts/build/kernel_linux.sh Sat Jun 16 20:47:58 2007 +0000
4.2 +++ b/scripts/build/kernel_linux.sh Sat Jun 16 21:44:45 2007 +0000
4.3 @@ -4,7 +4,10 @@
4.4
4.5 do_print_filename() {
4.6 [ "${CT_KERNEL}" = "linux" ] || return 0
4.7 - echo "${CT_KERNEL_FILE}"
4.8 + case "${CT_KERNEL_LINUX_HEADERS_SANITISED}" in
4.9 + y) echo "linux-libc-headers-${CT_KERNEL_VERSION}";;
4.10 + *) echo "linux-${CT_KERNEL_VERSION}";;
4.11 + esac
4.12 }
4.13
4.14 # Download the kernel
5.1 --- a/scripts/build/libc_glibc.sh Sat Jun 16 20:47:58 2007 +0000
5.2 +++ b/scripts/build/libc_glibc.sh Sat Jun 16 21:44:45 2007 +0000
5.3 @@ -4,11 +4,11 @@
5.4
5.5 do_print_filename() {
5.6 [ "${CT_LIBC}" = "glibc" ] || return 0
5.7 - echo "${CT_LIBC_FILE}"
5.8 + echo "glibc-${CT_LIBC_VERSION}"
5.9 for addon in `do_libc_add_ons_list " "`; do
5.10 # NPTL addon is not to be downloaded, in any case
5.11 [ "${addon}" = "nptl" ] && continue || true
5.12 - echo "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
5.13 + echo "glibc-${addon}-${CT_LIBC_VERSION}"
5.14 done
5.15 }
5.16
6.1 --- a/scripts/build/libc_uClibc.sh Sat Jun 16 20:47:58 2007 +0000
6.2 +++ b/scripts/build/libc_uClibc.sh Sat Jun 16 21:44:45 2007 +0000
6.3 @@ -4,7 +4,7 @@
6.4
6.5 do_print_filename() {
6.6 [ "${CT_LIBC}" = "uClibc" ] || return 0
6.7 - echo "${CT_LIBC_FILE}"
6.8 + echo "uClibc-${CT_LIBC_VERSION}"
6.9 [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && echo "uClibc-locale-030818" || true
6.10 }
6.11
7.1 --- a/scripts/build/libfloat.sh Sat Jun 16 20:47:58 2007 +0000
7.2 +++ b/scripts/build/libfloat.sh Sat Jun 16 21:44:45 2007 +0000
7.3 @@ -6,7 +6,7 @@
7.4 if [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ]; then
7.5
7.6 do_print_filename() {
7.7 - echo "${CT_LIBFLOAT_FILE}"
7.8 + echo "libfloat-${CT_LIBFLOAT_VERSION}"
7.9 }
7.10
7.11 # Download libfloat