Fix saving samples when the uClibc config file is already saved.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Oct 17 14:26:53 2008 +0000 (2008-10-17)
changeset 944a6e9767c8ef9
parent 943 1cca90ce0481
child 945 d0e5f04d2e06
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(-)
samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
samples/arm-unknown-linux-uclibcgnueabi/reported.by
scripts/saveSample.sh
     1.1 --- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config	Fri Oct 17 12:47:53 2008 +0000
     1.2 +++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config	Fri Oct 17 14:26:53 2008 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 -# crosstool-NG version: 1.2.0+svn_trunk@976
     1.7 -# Thu Sep  4 17:13:33 2008
     1.8 +# crosstool-NG version: 1.2.0+svn_trunk@1097:1098
     1.9 +# Fri Oct 17 14:51:47 2008
    1.10  #
    1.11  
    1.12  #
    1.13 @@ -13,7 +13,6 @@
    1.14  #
    1.15  # CT_OBSOLETE is not set
    1.16  CT_EXPERIMENTAL=y
    1.17 -# CT_BROKEN is not set
    1.18  # CT_DEBUG_CT is not set
    1.19  
    1.20  #
    1.21 @@ -52,7 +51,7 @@
    1.22  CT_LOAD=0
    1.23  CT_NICE=0
    1.24  CT_USE_PIPES=y
    1.25 -# CT_CONFIG_SHELL_ASH is not set
    1.26 +CT_CONFIG_SHELL_ASH=y
    1.27  
    1.28  #
    1.29  # Logging
    1.30 @@ -97,13 +96,13 @@
    1.31  #
    1.32  # CT_ARCH_alpha is not set
    1.33  CT_ARCH_arm=y
    1.34 -CT_ARCH_ARM_EABI=y
    1.35  # CT_ARCH_ia64 is not set
    1.36  # CT_ARCH_mips is not set
    1.37  # CT_ARCH_powerpc is not set
    1.38  # CT_ARCH_sh is not set
    1.39  # CT_ARCH_x86 is not set
    1.40  # CT_ARCH_x86_64 is not set
    1.41 +CT_ARCH_ARM_EABI=y
    1.42  
    1.43  #
    1.44  # Target optimisations
    1.45 @@ -134,67 +133,49 @@
    1.46  CT_CC_NATIVE="gcc"
    1.47  
    1.48  #
    1.49 -# Kernel
    1.50 +# Operating System
    1.51  #
    1.52 -CT_KERNEL_LINUX=y
    1.53 -CT_KERNEL_VERSION="2.6.26.3"
    1.54 -CT_KERNEL_LINUX_HEADERS_INSTALL=y
    1.55 -# CT_KERNEL_LINUX_HEADERS_SANITISED is not set
    1.56 -# CT_KERNEL_LINUX_HEADERS_COPY is not set
    1.57 -# CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR is not set
    1.58 +# CT_BARE_METAL is not set
    1.59  CT_KERNEL="linux"
    1.60 -CT_KERNEL_VERSION_SEE_EXTRAVERSION=y
    1.61 -# CT_KERNEL_INSTALL_V_2_6_18_8 is not set
    1.62 -# CT_KERNEL_INSTALL_V_2_6_19_7 is not set
    1.63 -# CT_KERNEL_INSTALL_V_2_6_20_21 is not set
    1.64 -# CT_KERNEL_INSTALL_V_2_6_21_7 is not set
    1.65 -# CT_KERNEL_INSTALL_V_2_6_22_19 is not set
    1.66 -# CT_KERNEL_INSTALL_V_2_6_23_17 is not set
    1.67 -# CT_KERNEL_INSTALL_V_2_6_24 is not set
    1.68 -# CT_KERNEL_INSTALL_V_2_6_24_1 is not set
    1.69 -# CT_KERNEL_INSTALL_V_2_6_24_2 is not set
    1.70 -# CT_KERNEL_INSTALL_V_2_6_24_3 is not set
    1.71 -# CT_KERNEL_INSTALL_V_2_6_24_4 is not set
    1.72 -# CT_KERNEL_INSTALL_V_2_6_24_5 is not set
    1.73 -# CT_KERNEL_INSTALL_V_2_6_24_6 is not set
    1.74 -# CT_KERNEL_INSTALL_V_2_6_24_7 is not set
    1.75 -# CT_KERNEL_INSTALL_V_2_6_25 is not set
    1.76 -# CT_KERNEL_INSTALL_V_2_6_25_1 is not set
    1.77 -# CT_KERNEL_INSTALL_V_2_6_25_2 is not set
    1.78 -# CT_KERNEL_INSTALL_V_2_6_25_3 is not set
    1.79 -# CT_KERNEL_INSTALL_V_2_6_25_4 is not set
    1.80 -# CT_KERNEL_INSTALL_V_2_6_25_5 is not set
    1.81 -# CT_KERNEL_INSTALL_V_2_6_25_6 is not set
    1.82 -# CT_KERNEL_INSTALL_V_2_6_25_7 is not set
    1.83 -# CT_KERNEL_INSTALL_V_2_6_25_8 is not set
    1.84 -# CT_KERNEL_INSTALL_V_2_6_25_9 is not set
    1.85 -# CT_KERNEL_INSTALL_V_2_6_25_10 is not set
    1.86 -# CT_KERNEL_INSTALL_V_2_6_25_11 is not set
    1.87 -# CT_KERNEL_INSTALL_V_2_6_25_12 is not set
    1.88 -# CT_KERNEL_INSTALL_V_2_6_25_13 is not set
    1.89 -# CT_KERNEL_INSTALL_V_2_6_25_14 is not set
    1.90 -# CT_KERNEL_INSTALL_V_2_6_25_15 is not set
    1.91 -# CT_KERNEL_INSTALL_V_2_6_26 is not set
    1.92 -# CT_KERNEL_INSTALL_V_2_6_26_1 is not set
    1.93 -# CT_KERNEL_INSTALL_V_2_6_26_2 is not set
    1.94 -CT_KERNEL_INSTALL_V_2_6_26_3=y
    1.95 -CT_KERNEL_LINUX_HEADERS_INSTALL_CHECK=y
    1.96 +CT_KERNEL_VERSION="2.6.26.6"
    1.97 +# CT_KERNEL_bare_metal is not set
    1.98 +CT_KERNEL_linux=y
    1.99 +CT_KERNEL_LINUX_INSTALL=y
   1.100 +CT_KERNEL_LINUX_INSTALL_CHECK=y
   1.101 +# CT_KERNEL_V_2_6_18_8 is not set
   1.102 +# CT_KERNEL_V_2_6_19_7 is not set
   1.103 +# CT_KERNEL_V_2_6_20_21 is not set
   1.104 +# CT_KERNEL_V_2_6_21_7 is not set
   1.105 +# CT_KERNEL_V_2_6_22_19 is not set
   1.106 +# CT_KERNEL_V_2_6_23_17 is not set
   1.107 +# CT_KERNEL_V_2_6_24_7 is not set
   1.108 +# CT_KERNEL_V_2_6_25_18 is not set
   1.109 +# CT_KERNEL_V_2_6_26 is not set
   1.110 +# CT_KERNEL_V_2_6_26_1 is not set
   1.111 +# CT_KERNEL_V_2_6_26_2 is not set
   1.112 +# CT_KERNEL_V_2_6_26_3 is not set
   1.113 +# CT_KERNEL_V_2_6_26_4 is not set
   1.114 +# CT_KERNEL_V_2_6_26_5 is not set
   1.115 +CT_KERNEL_V_2_6_26_6=y
   1.116 +# CT_KERNEL_V_2_6_27 is not set
   1.117  CT_KERNEL_LINUX_VERBOSITY_0=y
   1.118  # CT_KERNEL_LINUX_VERBOSITY_1 is not set
   1.119  # CT_KERNEL_LINUX_VERBOSITY_2 is not set
   1.120  CT_KERNEL_LINUX_VERBOSE_LEVEL=0
   1.121 -# CT_KERNEL_LINUX_NEEDS_CONFIG is not set
   1.122 +# CT_KERNEL_LINUX_USE_CUSTOM_DIR is not set
   1.123  
   1.124  #
   1.125  # GMP and MPFR
   1.126  #
   1.127  CT_GMP_MPFR=y
   1.128  CT_GMP_MPFR_TARGET=y
   1.129 -CT_GMP_V_4_2_2=y
   1.130 -CT_GMP_VERSION="4.2.2"
   1.131 +# CT_GMP_V_4_2_2 is not set
   1.132 +CT_GMP_V_4_2_4=y
   1.133 +CT_GMP_VERSION="4.2.4"
   1.134  CT_GMP_CHECK=y
   1.135 -CT_MPFR_V_2_3_1=y
   1.136 -CT_MPFR_VERSION="2.3.1"
   1.137 +# CT_MPFR_V_2_3_1 is not set
   1.138 +CT_MPFR_V_2_3_2=y
   1.139 +CT_MPFR_VERSION="2.3.2"
   1.140  CT_MPFR_CHECK=y
   1.141  
   1.142  #
   1.143 @@ -210,6 +191,12 @@
   1.144  # CT_BINUTILS_V_2_18_50_0_6 is not set
   1.145  # CT_BINUTILS_V_2_18_50_0_7 is not set
   1.146  # CT_BINUTILS_V_2_18_50_0_8 is not set
   1.147 +# CT_BINUTILS_V_2_18_50_0_9 is not set
   1.148 +# CT_BINUTILS_V_2_18_90 is not set
   1.149 +# CT_BINUTILS_V_2_18_91 is not set
   1.150 +# CT_BINUTILS_V_2_18_92 is not set
   1.151 +# CT_BINUTILS_V_2_18_93 is not set
   1.152 +# CT_BINUTILS_V_2_19_50_0_1 is not set
   1.153  CT_BINUTILS_EXTRA_CONFIG=""
   1.154  CT_BINUTILS_FOR_TARGET=y
   1.155  CT_BINUTILS_FOR_TARGET_IBERTY=y
   1.156 @@ -218,9 +205,9 @@
   1.157  #
   1.158  # C compiler
   1.159  #
   1.160 -CT_CC_GCC=y
   1.161 -CT_CC_VERSION="4.3.1"
   1.162  CT_CC="gcc"
   1.163 +CT_CC_VERSION="4.3.2"
   1.164 +CT_CC_gcc=y
   1.165  # CT_CC_V_2_95_3 is not set
   1.166  # CT_CC_V_3_2_3 is not set
   1.167  # CT_CC_V_3_3_6 is not set
   1.168 @@ -239,7 +226,8 @@
   1.169  # CT_CC_V_4_2_3 is not set
   1.170  # CT_CC_V_4_2_4 is not set
   1.171  # CT_CC_V_4_3_0 is not set
   1.172 -CT_CC_V_4_3_1=y
   1.173 +# CT_CC_V_4_3_1 is not set
   1.174 +CT_CC_V_4_3_2=y
   1.175  CT_CC_GCC_4_3_or_later=y
   1.176  CT_CC_CXA_ATEXIT=y
   1.177  # CT_CC_SJLJ_EXCEPTIONS_CONFIGURE is not set
   1.178 @@ -266,21 +254,27 @@
   1.179  # CT_CC_LANG_OBJC is not set
   1.180  # CT_CC_LANG_OBJCXX is not set
   1.181  CT_CC_LANG_OTHERS=""
   1.182 +CT_LIBC="uClibc"
   1.183  
   1.184  #
   1.185  # C-library
   1.186  #
   1.187 -# CT_LIBC_GLIBC is not set
   1.188  CT_LIBC_VERSION="20080801"
   1.189 -# CT_LIBC_EGLIBC is not set
   1.190 -CT_LIBC_UCLIBC=y
   1.191 -# CT_LIBC_V_snapshot is not set
   1.192 -CT_LIBC_V_specific_date=y
   1.193 +# CT_LIBC_eglibc is not set
   1.194 +# CT_LIBC_glibc is not set
   1.195 +CT_LIBC_uClibc=y
   1.196 +# CT_EGLIBC_V_2_5 is not set
   1.197 +# CT_EGLIBC_V_2_6 is not set
   1.198 +# CT_EGLIBC_V_2_7 is not set
   1.199 +# CT_EGLIBC_V_2_8 is not set
   1.200 +# CT_EGLIBC_V_TRUNK is not set
   1.201  # CT_LIBC_V_0_9_28 is not set
   1.202  # CT_LIBC_V_0_9_28_1 is not set
   1.203  # CT_LIBC_V_0_9_28_2 is not set
   1.204  # CT_LIBC_V_0_9_28_3 is not set
   1.205  # CT_LIBC_V_0_9_29 is not set
   1.206 +# CT_LIBC_V_snapshot is not set
   1.207 +CT_LIBC_V_specific_date=y
   1.208  CT_LIBC_UCLIBC_VERBOSITY_0=y
   1.209  # CT_LIBC_UCLIBC_VERBOSITY_1 is not set
   1.210  CT_LIBC_UCLIBC_VERBOSITY=""
   1.211 @@ -290,18 +284,25 @@
   1.212  CT_LIBC_UCLIBC_DEBUG_LEVEL=0
   1.213  CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
   1.214  # CT_LIBC_UCLIBC_LOCALES is not set
   1.215 -CT_LIBC="uClibc"
   1.216 +
   1.217 +#
   1.218 +# Common C library options
   1.219 +#
   1.220  # CT_LIBC_SUPPORT_NPTL is not set
   1.221  CT_LIBC_SUPPORT_LINUXTHREADS=y
   1.222 +CT_THREADS="linuxthreads"
   1.223  # CT_THREADS_NPTL is not set
   1.224  CT_THREADS_LINUXTHREADS=y
   1.225  # CT_THREADS_NONE is not set
   1.226 -CT_THREADS="linuxthreads"
   1.227 +# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
   1.228 +# CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
   1.229 +# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
   1.230  
   1.231  #
   1.232  # Tools facilities
   1.233  #
   1.234 -CT_SSTRIP=y
   1.235 +# CT_TOOL_libelf is not set
   1.236 +CT_TOOL_sstrip=y
   1.237  # CT_SSTRIP_ELFKICKERS is not set
   1.238  CT_SSTRIP_BUILDROOT=y
   1.239  CT_SSTRIP_FROM="buildroot"
   1.240 @@ -309,11 +310,11 @@
   1.241  #
   1.242  # Debug facilities
   1.243  #
   1.244 -CT_DMALLOC=y
   1.245 +CT_DEBUG_dmalloc=y
   1.246  # CT_DMALLOC_V_5_4_3 is not set
   1.247  CT_DMALLOC_V_5_5_2=y
   1.248  CT_DMALLOC_VERSION="5.5.2"
   1.249 -CT_DUMA=y
   1.250 +CT_DEBUG_duma=y
   1.251  CT_DUMA_A=y
   1.252  CT_DUMA_SO=y
   1.253  # CT_DUMA_V_2_5_1 is not set
   1.254 @@ -321,7 +322,7 @@
   1.255  # CT_DUMA_V_2_5_12 is not set
   1.256  CT_DUMA_V_2_5_14=y
   1.257  CT_DUMA_VERSION="2_5_14"
   1.258 -CT_GDB=y
   1.259 +CT_DEBUG_gdb=y
   1.260  CT_GDB_CROSS=y
   1.261  # CT_GDB_CROSS_STATIC is not set
   1.262  # CT_GDB_CROSS_INSIGHT is not set
   1.263 @@ -330,13 +331,13 @@
   1.264  CT_GDB_NATIVE_USE_GMP_MPFR=y
   1.265  CT_GDB_GDBSERVER=y
   1.266  CT_GDB_GDBSERVER_STATIC=y
   1.267 -# CT_GDB_V_snapshot is not set
   1.268  # CT_GDB_V_6_4 is not set
   1.269  # CT_GDB_V_6_5 is not set
   1.270  # CT_GDB_V_6_6 is not set
   1.271  # CT_GDB_V_6_7 is not set
   1.272  # CT_GDB_V_6_7_1 is not set
   1.273  CT_GDB_V_6_8=y
   1.274 +# CT_GDB_V_snapshot is not set
   1.275  CT_GDB_VERSION="6.8"
   1.276  
   1.277  #
   1.278 @@ -344,7 +345,8 @@
   1.279  #
   1.280  CT_NCURSES_V_5_6=y
   1.281  CT_NCURSES_VERSION="5.6"
   1.282 -CT_STRACE=y
   1.283 +# CT_DEBUG_ltrace is not set
   1.284 +CT_DEBUG_strace=y
   1.285  # CT_STRACE_V_4_5 is not set
   1.286  # CT_STRACE_V_4_5_14 is not set
   1.287  # CT_STRACE_V_4_5_15 is not set
     2.1 --- a/samples/arm-unknown-linux-uclibcgnueabi/reported.by	Fri Oct 17 12:47:53 2008 +0000
     2.2 +++ b/samples/arm-unknown-linux-uclibcgnueabi/reported.by	Fri Oct 17 14:26:53 2008 +0000
     2.3 @@ -0,0 +1,3 @@
     2.4 +reporter_name="Yann E. MORIN"
     2.5 +reporter_url="http://ymorin.is-a-geek.org/"
     2.6 +reporter_comment=""
     3.1 --- a/scripts/saveSample.sh	Fri Oct 17 12:47:53 2008 +0000
     3.2 +++ b/scripts/saveSample.sh	Fri Oct 17 14:26:53 2008 +0000
     3.3 @@ -58,8 +58,8 @@
     3.4  CT_DoAddFileToSample() {
     3.5      source="$1"
     3.6      dest="$2"
     3.7 -    inode_s=$(ls -i "${source}")
     3.8 -    inode_d=$(ls -i "${dest}" 2>/dev/null || true)
     3.9 +    inode_s=$(ls -i "${source}" |awk '{ print $1; }')
    3.10 +    inode_d=$(ls -i "${dest}" 2>/dev/null |awk '{ print $1; }' || true)
    3.11      if [ "${inode_s}" != "${inode_d}" ]; then
    3.12          cp "${source}" "${dest}"
    3.13      fi