projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| cc8d31f6 JR |
1 | diff -urNp linux-400/Makefile linux-600/Makefile |
| 2 | --- linux-400/Makefile | |
| 3 | +++ linux-600/Makefile | |
| 4 | @@ -305,6 +305,9 @@ symlinks: | |
| 5 | oldconfig: symlinks | |
| 6 | $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in | |
| 7 | ||
| 8 | +oldconfig_nonint: symlinks | |
| 9 | + $(CONFIG_SHELL) scripts/Configure -D arch/$(ARCH)/config.in | |
| 10 | + | |
| 11 | xconfig: symlinks | |
| 12 | $(MAKE) -C scripts kconfig.tk | |
| 13 | wish -f scripts/kconfig.tk | |
| 14 | diff -urNp linux-400/scripts/Configure linux-600/scripts/Configure | |
| 15 | --- linux-400/scripts/Configure | |
| 16 | +++ linux-600/scripts/Configure | |
| 17 | @@ -122,8 +122,14 @@ function readln () { | |
| 18 | else | |
| 19 | echo -n "$1" | |
| 20 | [ -z "$3" ] && echo -n "(NEW) " | |
| 21 | - IFS='@' read ans || exit 1 | |
| 22 | - [ -z "$ans" ] && ans=$2 | |
| 23 | + if [ "$NONINTERACTIVE" = "y" ]; then | |
| 24 | + echo "$1" >> nodefaults | |
| 25 | + broken="y" | |
| 26 | + ans="n" | |
| 27 | + else | |
| 28 | + IFS='@' read ans || exit 1 | |
| 29 | + [ -z "$ans" ] && ans=$2 | |
| 30 | + fi | |
| 31 | fi | |
| 32 | } | |
| 33 | ||
| 34 | @@ -510,6 +516,7 @@ function choice () { | |
| 35 | CONFIG=.tmpconfig | |
| 36 | CONFIG_H=.tmpconfig.h | |
| 37 | trap "rm -f $CONFIG $CONFIG_H ; exit 1" 1 2 | |
| 38 | +trap "rm -f nodefaults ; exit 1" 1 2 | |
| 39 | ||
| 40 | # | |
| 41 | # Make sure we start out with a clean slate. | |
| 42 | @@ -524,11 +531,20 @@ echo " */" >> $CONFIG_H | |
| 43 | echo "#define AUTOCONF_INCLUDED" >> $CONFIG_H | |
| 44 | ||
| 45 | DEFAULT="" | |
| 46 | +NONINTERACTIVE="" | |
| 47 | + | |
| 48 | if [ "$1" = "-d" ] ; then | |
| 49 | DEFAULT="-d" | |
| 50 | shift | |
| 51 | fi | |
| 52 | ||
| 53 | +if [ "$1" = "-D" ] ; then | |
| 54 | +# non interactive oldconfig | |
| 55 | + DEFAULT="-d" | |
| 56 | + NONINTERACTIVE="y" | |
| 57 | + shift | |
| 58 | +fi | |
| 59 | + | |
| 60 | CONFIG_IN=./config.in | |
| 61 | if [ "$1" != "" ] ; then | |
| 62 | CONFIG_IN=$1 | |
| 63 | @@ -572,4 +588,9 @@ else | |
| 64 | fi | |
| 65 | echo | |
| 66 | ||
| 67 | +if [ "$broken" = "y" ] ; then | |
| 68 | + echo "The following defaults are missing:" | |
| 69 | + cat nodefaults | |
| 70 | + exit 1 | |
| 71 | +fi | |
| 72 | exit 0 |