1.1 --- a/scripts/tarball.sh Mon Jun 04 17:51:55 2007 +0000
1.2 +++ b/scripts/tarball.sh Sun Jun 17 11:13:48 2007 +0000
1.3 @@ -9,8 +9,9 @@
1.4 # We need the functions first:
1.5 . "${CT_TOP_DIR}/scripts/functions"
1.6
1.7 -exec 6>&1
1.8 +# Don't care about any log file
1.9 exec >/dev/null
1.10 +rm -f "${tmp_log_file}"
1.11
1.12 # Parse the configuration file:
1.13 . ${CT_TOP_DIR}/.config
1.14 @@ -21,34 +22,30 @@
1.15 # re-parse them:
1.16 . "${CT_TOP_DIR}/.config"
1.17
1.18 -# Override log level
1.19 -unset CT_LOG_ERROR CT_LOG_WARN CT_LOG_EXTRA CT_LOG_DEBUG
1.20 -CT_LOG_INFO=y
1.21 -CT_LOG_LEVEL_MAX="INFO"
1.22 -
1.23 -# Build the files' base names
1.24 -CT_KERNEL_FILE="${CT_KERNEL}-${CT_KERNEL_VERSION}"
1.25 -CT_BINUTILS_FILE="binutils-${CT_BINUTILS_VERSION}"
1.26 -CT_LIBC_FILE="${CT_LIBC}-${CT_LIBC_VERSION}"
1.27 -for addon in ${CT_LIBC_ADDONS_LIST}; do
1.28 - CT_LIBC_ADDONS_FILES="${CT_LIBC_ADDONS_FILES} ${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
1.29 -done
1.30 -[ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && CT_LIBC_ADDONS_FILES="${CT_LIBC_ADDONS_FILES} ${CT_LIBC}-ports-${CT_LIBC_VERSION}"
1.31 -[ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_LIBC_ADDONS_FILES="${CT_LIBC_ADDONS_FILES} ${CT_LIBC}-locales-030818"
1.32 -[ "${CT_CC_USE_CORE}" = "y" ] && CT_CC_CORE_FILE="${CT_CC_CORE}-${CT_CC_CORE_VERSION}"
1.33 -CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"
1.34 -[ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ] && CT_LIBFLOAT_FILE="libfloat-990616"
1.35 -
1.36 -# Build a one-line list of the files to ease scanning below
1.37 +# Build a one-line list of files to include
1.38 +CT_DoStep DEBUG "Building list of tarballs to add"
1.39 CT_TARBALLS_DIR="${CT_TOP_DIR}/targets/tarballs"
1.40 -CT_TARBALLS=" "
1.41 -for file_var in CT_KERNEL_FILE CT_BINUTILS_FILE CT_LIBC_FILE CT_LIBC_ADDONS_FILES CT_CC_CORE_FILE CT_CC_FILE CT_LIBFLOAT_FILE; do
1.42 - for file in ${!file_var}; do
1.43 - ext=`CT_GetFileExtension "${file}"`
1.44 - CT_TestAndAbort "Missing tarball for: \"${file}\"" -z "${ext}"
1.45 - CT_TARBALLS="${CT_TARBALLS}${file}${ext} "
1.46 +CT_TARBALLS=""
1.47 +for dir in '' tools debug; do
1.48 + CT_DoStep DEBUG "Scanning directory \"${dir}\""
1.49 + for script in "${CT_TOP_DIR}/scripts/build/${dir}/"*.sh; do
1.50 + CT_DoStep DEBUG "Testing component \"${script}\""
1.51 + [ -n "${script}" ] || continue
1.52 + unset do_print_file_name
1.53 + . "${script}"
1.54 + for file in `do_print_filename`; do
1.55 + CT_DoLog DEBUG "Finding tarball for \"${file}\""
1.56 + [ -n "${file}" ] || continue
1.57 + ext=`CT_GetFileExtension "${file}"`
1.58 + CT_TestOrAbort "Missing tarball for: \"${file}\"" -f "${CT_TOP_DIR}/targets/tarballs/${file}${ext}"
1.59 + CT_DoLog DEBUG "Found \"${file}${ext}\""
1.60 + CT_TARBALLS="${CT_TARBALLS} ${file}${ext}"
1.61 + done
1.62 + CT_EndStep
1.63 done
1.64 -done
1.65 + CT_EndStep
1.66 +done
1.67 +CT_EndStep
1.68
1.69 # We need to emulate a build directory:
1.70 CT_BUILD_DIR="${CT_TOP_DIR}/targets/${CT_TARGET}/build"
1.71 @@ -61,27 +58,39 @@
1.72
1.73 botdir=`pwd`
1.74
1.75 -# Build the list of files to exclude:
1.76 -echo "${topdir}/log.*" >"${tempdir}/${CT_TARGET}.list"
1.77 -echo "${topdir}/targets/*-*-*-*" >>"${tempdir}/${CT_TARGET}.list"
1.78 -for t in `ls -1 "${topdir}/targets/tarballs/"`; do
1.79 - case "${CT_TARBALLS}" in
1.80 - *" ${t} "*) ;;
1.81 - *) echo "${topdir}/targets/tarballs/${t}" >>"${tempdir}/${CT_TARGET}.list"
1.82 - esac
1.83 -done
1.84 +# Build the list of files to exclude
1.85 +CT_DoLog DEBUG "Building list of files to exclude"
1.86 +exclude_list="${tempdir}/${CT_TARGET}.list"
1.87 +{ echo ".svn"; \
1.88 + echo "${topdir}/log.*"; \
1.89 + echo "${topdir}/targets/src"; \
1.90 + echo "${topdir}/targets/tst"; \
1.91 + echo "${topdir}/targets/*-*-*-*"; \
1.92 + for t in `ls -1 "${topdir}/targets/tarballs/"`; do \
1.93 + case " ${CT_TARBALLS} " in \
1.94 + *" ${t} "*) ;; \
1.95 + *) echo "${topdir}/targets/tarballs/${t}";; \
1.96 + esac; \
1.97 + done; \
1.98 +} >"${exclude_list}"
1.99
1.100 -CT_DoLog INFO "Saving crosstool"
1.101 -tar cfj "${CT_PREFIX_DIR}/${topdir}.${CT_TARGET}.tar.bzip2" \
1.102 - --no-wildcards-match-slash \
1.103 - -X "${tempdir}/${CT_TARGET}.list" \
1.104 - "${topdir}" 2>/dev/null
1.105 +# Render the install directory writable
1.106 +chmod u+w "${CT_PREFIX_DIR}"
1.107 +
1.108 +CT_DoLog INFO "Saving crosstool-ng into the toolchain directory"
1.109 +tar cvjf "${CT_PREFIX_DIR}/${topdir}.${CT_TARGET}.tar.bzip2" \
1.110 + --no-wildcards-match-slash \
1.111 + -X "${exclude_list}" \
1.112 + "${topdir}" 2>&1 |CT_DoLog ALL
1.113
1.114 CT_Popd
1.115
1.116 -# Save the generated toolchain
1.117 -CT_DoLog INFO "Saving the generated toolchain"
1.118 -tar cfj "${botdir}/${CT_TARGET}.tar.bz2" "${CT_PREFIX_DIR}" 2>/dev/null
1.119 +CT_DoLog INFO "Saving the toolchain"
1.120 +tar cvjf "${botdir}/${CT_TARGET}.tar.bz2" "${CT_PREFIX_DIR}" 2>&1 |CT_DoLog ALL
1.121
1.122 +CT_DoLog DEBUG "Getting rid of working directories"
1.123 rm -f "${CT_PREFIX_DIR}/${topdir}.${CT_TARGET}.tar.bzip2"
1.124 rm -rf "${tempdir}"
1.125 +
1.126 +# Render the install directory non-writable
1.127 +chmod u-w "${CT_PREFIX_DIR}"