Fix saving samples when the uClibc config file is already saved.
/trunk/scripts/saveSample.sh | 4 2 2 0
/trunk/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config | 140 71 69 0 ++++++++-------
/trunk/samples/arm-unknown-linux-uclibcgnueabi/reported.by | 3 3 0 0 +
3 files changed, 76 insertions(+), 71 deletions(-)
3 # This script is responsible for saving the current configuration into a
4 # sample to be used later on as a pre-configured target.
6 # What we need to save:
8 # - the uClibc .config file if uClibc selected
9 # - info about who reported the sample
11 # We'll need the stdout later, save it
14 . "${CT_LIB_DIR}/scripts/functions"
16 # Don't care about any log file
18 rm -f "${tmp_log_file}"
20 # Parse the configuration file
21 CT_TestOrAbort "Configuration file not found. Please create one." -f .config
24 # Do not use a progress bar
25 unset CT_LOG_PROGRESS_BAR
27 # Parse architecture-specific functions
28 . "${CT_LIB_DIR}/scripts/build/arch/${CT_ARCH}.sh"
30 # Target tuple: CT_TARGET needs a little love:
33 # Kludge: if any of the config options needs either CT_TARGET or CT_TOP_DIR,
37 # Override log options
38 unset CT_LOG_PROGRESS_BAR CT_LOG_ERROR CT_LOG_INFO CT_LOG_EXTRA CT_LOG_DEBUG LOG_ALL
40 CT_LOG_LEVEL_MAX="WARN"
42 # Create the sample directory
43 if [ ! -d "samples/${CT_TARGET}" ]; then
44 mkdir -p "samples/${CT_TARGET}"
47 # Save the crosstool-NG config file
48 sed -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;' \
49 -e 's|^# CT_LOG_TO_FILE is not set$|CT_LOG_TO_FILE=y|;' \
50 -e 's|^# CT_LOG_FILE_COMPRESS is not set$|CT_LOG_FILE_COMPRESS=y|;' \
51 -e 's|^(CT_LOCAL_TARBALLS_DIR)=.*|\1="${HOME}/src"|;' \
53 >"samples/${CT_TARGET}/crosstool.config"
55 # Function to copy a file to the sample directory
56 # Needed in case the file is already there (think of a previously available sample)
57 # Usage: CT_DoAddFileToSample <source> <dest>
58 CT_DoAddFileToSample() {
61 inode_s=$(ls -i "${source}" |awk '{ print $1; }')
62 inode_d=$(ls -i "${dest}" 2>/dev/null |awk '{ print $1; }' || true)
63 if [ "${inode_s}" != "${inode_d}" ]; then
64 cp "${source}" "${dest}"
68 if [ "${CT_TOP_DIR}" = "${CT_LIB_DIR}" ]; then
69 samp_top_dir="\${CT_LIB_DIR}"
71 samp_top_dir="\${CT_TOP_DIR}"
74 # Save the uClibc .config file
75 if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
76 # We save the file, and then point the saved sample to this file
77 CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
78 sed -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE=).+$|\1"'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
79 "samples/${CT_TARGET}/crosstool.config"
81 # remove any dangling files
82 for f in "samples/${CT_TARGET}/${CT_LIBC}-"*.config; do
83 if [ -f "${f}" ]; then rm -f "${f}"; fi
87 # Restore stdout now, to be interactive
90 # Fill-in the reported-by info
91 [ -f "samples/${CT_TARGET}/reported.by" ] && . "samples/${CT_TARGET}/reported.by"
92 old_name="${reporter_name}"
93 old_url="${reporter_url}"
94 read -p "Reporter name [${reporter_name}]: " reporter_name
95 read -p "Reporter URL [${reporter_url}]: " reporter_url
96 if [ -n "${reporter_comment}" ]; then
97 echo "Old comment if you need to copy-paste:"
98 printf "${reporter_comment}"
100 echo "Reporter comment (Ctrl-D to finish):"
101 reporter_comment=$(cat)
103 ( echo "reporter_name=\"${reporter_name:=${old_name}}\""
104 echo "reporter_url=\"${reporter_url:=${old_url}}\""
105 printf "reporter_comment=\"${reporter_comment}\"\n"
106 ) >"samples/${CT_TARGET}/reported.by"