summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-06-16 21:44:45 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-06-16 21:44:45 (GMT)
commitd8bc11b1653185bc826680243cc32b87a6451df2 (patch)
treec08e59bfde4dd8c19a3992c6b8e238994805eab4 /scripts
parenteefa05172a5d1c06b2674c47663e5be85e234aee (diff)
Fix printing components' file names.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/binutils.sh2
-rw-r--r--scripts/build/cc_core_gcc.sh2
-rw-r--r--scripts/build/cc_gcc.sh2
-rw-r--r--scripts/build/kernel_linux.sh5
-rw-r--r--scripts/build/libc_glibc.sh4
-rw-r--r--scripts/build/libc_uClibc.sh2
-rw-r--r--scripts/build/libfloat.sh2
7 files changed, 11 insertions, 8 deletions
diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh
index 3011006..cb10374 100644
--- a/scripts/build/binutils.sh
+++ b/scripts/build/binutils.sh
@@ -3,7 +3,7 @@
# Licensed under the GPL v2. See COPYING in the root of this package
do_print_filename() {
- echo "${CT_BINUTILS_FILE}"
+ echo "binutils-${CT_BINUTILS_VERSION}"
}
# Download binutils
diff --git a/scripts/build/cc_core_gcc.sh b/scripts/build/cc_core_gcc.sh
index 52db1d3..968e62e 100644
--- a/scripts/build/cc_core_gcc.sh
+++ b/scripts/build/cc_core_gcc.sh
@@ -4,7 +4,7 @@
do_print_filename() {
[ "${CT_CC_CORE}" = "gcc" ] || return 0
- echo "${CT_CC_CORE_FILE}"
+ echo "gcc-${CT_CC_CORE_VERSION}"
}
# Download core gcc
diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh
index 0b24f83..dc427cf 100644
--- a/scripts/build/cc_gcc.sh
+++ b/scripts/build/cc_gcc.sh
@@ -4,7 +4,7 @@
do_print_filename() {
[ "${CT_CC}" = "gcc" ] || return 0
- echo "${CT_CC_FILE}"
+ echo "gcc-${CT_CC_VERSION}"
}
# Download final gcc
diff --git a/scripts/build/kernel_linux.sh b/scripts/build/kernel_linux.sh
index f779505..9c5341b 100644
--- a/scripts/build/kernel_linux.sh
+++ b/scripts/build/kernel_linux.sh
@@ -4,7 +4,10 @@
do_print_filename() {
[ "${CT_KERNEL}" = "linux" ] || return 0
- echo "${CT_KERNEL_FILE}"
+ case "${CT_KERNEL_LINUX_HEADERS_SANITISED}" in
+ y) echo "linux-libc-headers-${CT_KERNEL_VERSION}";;
+ *) echo "linux-${CT_KERNEL_VERSION}";;
+ esac
}
# Download the kernel
diff --git a/scripts/build/libc_glibc.sh b/scripts/build/libc_glibc.sh
index 5474cda..6b6e890 100644
--- a/scripts/build/libc_glibc.sh
+++ b/scripts/build/libc_glibc.sh
@@ -4,11 +4,11 @@
do_print_filename() {
[ "${CT_LIBC}" = "glibc" ] || return 0
- echo "${CT_LIBC_FILE}"
+ 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 "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
+ echo "glibc-${addon}-${CT_LIBC_VERSION}"
done
}
diff --git a/scripts/build/libc_uClibc.sh b/scripts/build/libc_uClibc.sh
index cf434b0..0f0bf5c 100644
--- a/scripts/build/libc_uClibc.sh
+++ b/scripts/build/libc_uClibc.sh
@@ -4,7 +4,7 @@
do_print_filename() {
[ "${CT_LIBC}" = "uClibc" ] || return 0
- echo "${CT_LIBC_FILE}"
+ echo "uClibc-${CT_LIBC_VERSION}"
[ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && echo "uClibc-locale-030818" || true
}
diff --git a/scripts/build/libfloat.sh b/scripts/build/libfloat.sh
index 20613ef..7fc9e6d 100644
--- a/scripts/build/libfloat.sh
+++ b/scripts/build/libfloat.sh
@@ -6,7 +6,7 @@
if [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ]; then
do_print_filename() {
- echo "${CT_LIBFLOAT_FILE}"
+ echo "libfloat-${CT_LIBFLOAT_VERSION}"
}
# Download libfloat