diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-07-31 00:04:02 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-07-31 00:04:02 +0200 |
| commit | 6acb2ecac5620bb56c6aa560c25d62a47f4c12f5 (patch) | |
| tree | ae711b9bc4ec6a08293e3510c4831b35f7796b45 | |
| parent | 32ac6af49fbcb53746b88b097780b4f401b88ff8 (diff) | |
| download | crosstool-ng-6acb2ecac5620bb56c6aa560c25d62a47f4c12f5.tar.gz crosstool-ng-6acb2ecac5620bb56c6aa560c25d62a47f4c12f5.tar.bz2 crosstool-ng-6acb2ecac5620bb56c6aa560c25d62a47f4c12f5.zip | |
config: don't require .config.2 to save a sample
Samples should contain kconfig-parsable definitions, not script variables.
.config.2 contains bash arrays, which is definitely not kconfig-safe...
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
| -rw-r--r-- | scripts/saveSample.sh.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index 9e012aa3..de3ef311 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -22,10 +22,11 @@ rm -f "${tmp_log_file}" # Parse the configuration file # Don't use CT_TestOrAbort, it prints the test string to [DEBUG] -if [ ! -f .config.2 ]; then +# Note: we just need the non-mangled .config, not .config.2 +if [ ! -f .config ]; then CT_Abort "Configuration file not found. Please create one." fi -. .config.2 +. .config # We can not reliably save a sample which either uses local patches # and/or custom Linux kernel headers. Warn the user about this issue @@ -55,7 +56,7 @@ CT_DoBuildTargetTuple # Kludge: if any of the config options needs either CT_TARGET or CT_TOP_DIR, # re-parse them: -. .config.2 +. .config # Override log options unset CT_LOG_PROGRESS_BAR CT_LOG_ERROR CT_LOG_INFO CT_LOG_EXTRA CT_LOG_DEBUG LOG_ALL |