1.1 --- a/scripts/build/libc/eglibc.sh	Mon Sep 22 12:09:19 2008 +0000
     1.2 +++ b/scripts/build/libc/eglibc.sh	Mon Sep 22 19:51:29 2008 +0000
     1.3 @@ -19,9 +19,6 @@
     1.4          *)      svn_url="svn://svn.eglibc.org/branches/eglibc-${CT_LIBC_VERSION}";;
     1.5      esac
     1.6  
     1.7 -    CT_MktempDir tmp_dir
     1.8 -    CT_Pushd "${tmp_dir}"
     1.9 -
    1.10      case "${CT_EGLIBC_CHECKOUT}" in
    1.11          y)  svn_action="checkout";;
    1.12          *)  svn_action="export --force";;
    1.13 @@ -32,18 +29,13 @@
    1.14  
    1.15      # Compress eglibc
    1.16      CT_DoExecLog ALL mv libc "${CT_LIBC_FILE}"
    1.17 -    CT_DoExecLog ALL tar cjf "${CT_TARBALLS_DIR}/${CT_LIBC_FILE}.tar.bz2" "${CT_LIBC_FILE}"
    1.18 +    CT_DoExecLog ALL tar cjf "${CT_LIBC_FILE}.tar.bz2" "${CT_LIBC_FILE}"
    1.19  
    1.20      # Compress linuxthreads, localedef and ports
    1.21      # Assign them the name the way ct-ng like it
    1.22      for addon in linuxthreads localedef ports; do
    1.23 -        CT_DoExecLog ALL tar cjf "${CT_TARBALLS_DIR}/${CT_LIBC}-${addon}-${CT_LIBC_VERSION}.tar.bz2" "${addon}"
    1.24 +        CT_DoExecLog ALL tar cjf "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}.tar.bz2" "${addon}"
    1.25      done
    1.26 -
    1.27 -    CT_Popd
    1.28 -
    1.29 -    # Remove source files
    1.30 -    CT_DoExecLog ALL rm -rf "${tmp_dir}"
    1.31  }
    1.32  
    1.33  # Download glibc
    1.34 @@ -81,7 +73,20 @@
    1.35  
    1.36      # Not found locally, try from the network
    1.37      CT_DoLog EXTRA "Retrieving 'eglibc-${CT_LIBC_VERSION}'"
    1.38 +
    1.39 +    CT_MktempDir tmp_dir
    1.40 +    CT_Pushd "${tmp_dir}"
    1.41 +
    1.42      do_eglibc_get
    1.43 +    CT_DoLog DEBUG "Moving 'eglibc-${CT_LIBC_VERSION}' to tarball directory"
    1.44 +    for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do
    1.45 +        CT_DoExecLog ALL mv -f "${file}" "${CT_TARBALLS_DIR}"
    1.46 +    done
    1.47 +
    1.48 +    CT_Popd
    1.49 +
    1.50 +    # Remove source files
    1.51 +    CT_DoExecLog ALL rm -rf "${tmp_dir}"
    1.52  
    1.53      if [ "${CT_SAVE_TARBALLS}" = "y" ]; then
    1.54          CT_DoLog EXTRA "Saving 'eglibc-${CT_LIBC_VERSION}' to local storage"