1.1 --- a/scripts/saveSample.sh.in Thu Apr 22 19:21:03 2010 +0200
1.2 +++ b/scripts/saveSample.sh.in Thu May 19 22:29:49 2011 +0200
1.3 @@ -22,10 +22,10 @@
1.4
1.5 # Parse the configuration file
1.6 # Don't use CT_TestOrAbort, it prints the test string to [DEBUG]
1.7 -if [ ! -f .config ]; then
1.8 +if [ ! -f .config.2 ]; then
1.9 CT_Abort "Configuration file not found. Please create one."
1.10 fi
1.11 -. .config
1.12 +. .config.2
1.13
1.14 # We can not reliably save a sample which either uses local patches
1.15 # and/or custom Linux kernel headers. Warn the user about this issue
1.16 @@ -55,7 +55,7 @@
1.17
1.18 # Kludge: if any of the config options needs either CT_TARGET or CT_TOP_DIR,
1.19 # re-parse them:
1.20 -. .config
1.21 +. .config.2
1.22
1.23 # Override log options
1.24 unset CT_LOG_PROGRESS_BAR CT_LOG_ERROR CT_LOG_INFO CT_LOG_EXTRA CT_LOG_DEBUG LOG_ALL
1.25 @@ -72,6 +72,8 @@
1.26 mkdir -p "${samp_dir}"
1.27
1.28 # Save the crosstool-NG config file
1.29 +# We need to save the real .config with kconfig's values,
1.30 +# not our mangled .config.2 with arrays
1.31 "${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;' \
1.32 -e 's|^# CT_LOG_TO_FILE is not set$|CT_LOG_TO_FILE=y|;' \
1.33 -e 's|^# CT_LOG_FILE_COMPRESS is not set$|CT_LOG_FILE_COMPRESS=y|;' \