Changeset 3205

Show
Ignore:
Timestamp:
07/12/07 15:22:34 (1 year ago)
Author:
austriancoder
Message:

This commit is a solution for the following problem:

Our snapshotbuilder - I will send a mail around in the next days for more
informations - will do the following tasks to generate a build:
* make distclean
* make allmodconfig
* changes target platform and other stuff in generated .config
* make oldconfig
* make

make oldconfig needs userinteraction and the user needs only to press
ENTER a few times (remeber: we changed some config values in step 3).
As we want to run our builds without userinteraction, we need something.
Now this commit introduces a new make target: snapshotupdate
It is equal to oldconfig, but uses data from stdin. So we can call e.g.
printf "\n" | make snapshotupdate (no user interaction)
instead of make oldconfig (with user interaction).

If somebody is not happy with this solution, commit a _working_ replacement,
which has the same functionality.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/freewrt/Makefile

    r3202 r3205  
    9191wconfig: .prereq_done 
    9292        @${GMAKE_INV} _config W=-A 
     93 
     94snapshotupdate: .prereq_done 
     95        @${GMAKE_INV} _config W=-s 
    9396 
    9497cleandir: .prereq_done 
     
    219222 
    220223.PHONY: prereq prereq-noerror _tarball targz tarbz2 
     224#  
  • trunk/freewrt/tools/config/conf.c

    r2928 r3205  
    3535static int valid_stdin = 1; 
    3636static int conf_cnt; 
     37static int press_enter = 0; 
    3738static char line[128]; 
    3839static struct menu *rootEntry; 
     
    5960static void check_stdin(void) 
    6061{ 
    61         if (!valid_stdin && input_mode == ask_silent) { 
     62        if (!valid_stdin && input_mode == ask_silent && !press_enter) { 
    6263                printf("aborted!\n\n"); 
    6364                printf("Console input/output is redirected. "); 
     
    503504                        input_mode = ask_new; 
    504505                        break; 
     506                case 'a': 
     507                        input_mode = ask_new; 
     508                        press_enter = 1; 
     509                        break; 
    505510                case 's': 
    506511                        input_mode = ask_silent;