# HG changeset patch # User "Yann E. MORIN" # Date 1312063442 -7200 # Node ID af55c37bbd84018648f297da3267cb800dbc1d2b # Parent b0cc1bf3e851103abe7ecf37b6bb84e5e8306ccb 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" diff -r b0cc1bf3e851 -r af55c37bbd84 scripts/saveSample.sh.in --- a/scripts/saveSample.sh.in Sat Jul 30 00:05:53 2011 +0200 +++ b/scripts/saveSample.sh.in Sun Jul 31 00:04:02 2011 +0200 @@ -22,10 +22,11 @@ # 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 @@ # 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