mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

83 lines
2.5 KiB

  1. diff -dur linux-2.6.17-orig/scripts/kconfig/conf.c linux-2.6.17/scripts/kconfig/conf.c
  2. --- linux-2.6.17-orig/scripts/kconfig/conf.c 2006-06-18 03:49:35.000000000 +0200
  3. +++ linux-2.6.17/scripts/kconfig/conf.c 2006-07-27 22:13:38.000000000 +0200
  4. @@ -21,6 +21,7 @@
  5. ask_all,
  6. ask_new,
  7. ask_silent,
  8. + ask_no2mod,
  9. set_default,
  10. set_yes,
  11. set_mod,
  12. @@ -92,6 +93,15 @@
  13. return;
  14. }
  15. break;
  16. + case ask_no2mod:
  17. + if (type == S_TRISTATE &&
  18. + sym_get_tristate_value(sym) == no) {
  19. + fprintf(stderr, "Setting %s to 'm'.\n", sym->name);
  20. + line[0] = 'm';
  21. + line[1] = '\n';
  22. + line[2] = 0;
  23. + break;
  24. + }
  25. case ask_new:
  26. case ask_silent:
  27. if (sym_has_value(sym)) {
  28. @@ -354,6 +364,7 @@
  29. break;
  30. }
  31. check_stdin();
  32. + case ask_no2mod:
  33. case ask_all:
  34. fflush(stdout);
  35. fgets(line, 128, stdin);
  36. @@ -523,6 +534,9 @@
  37. case 'm':
  38. input_mode = set_mod;
  39. break;
  40. + case 'M':
  41. + input_mode = ask_no2mod;
  42. + break;
  43. case 'y':
  44. input_mode = set_yes;
  45. break;
  46. @@ -565,6 +579,7 @@
  47. }
  48. case ask_all:
  49. case ask_new:
  50. + case ask_no2mod:
  51. conf_read(NULL);
  52. break;
  53. case set_no:
  54. diff -dur linux-2.6.17-orig/scripts/kconfig/Makefile linux-2.6.17/scripts/kconfig/Makefile
  55. --- linux-2.6.17-orig/scripts/kconfig/Makefile 2006-06-18 03:49:35.000000000 +0200
  56. +++ linux-2.6.17/scripts/kconfig/Makefile 2006-07-27 22:15:10.000000000 +0200
  57. @@ -42,7 +42,7 @@
  58. $(Q)rm -f arch/um/Kconfig_arch
  59. $(Q)rm -f scripts/kconfig/linux_*.pot scripts/kconfig/config.pot
  60. -PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
  61. +PHONY += randconfig allyesconfig allnoconfig allmodconfig no2modconfig defconfig
  62. randconfig: $(obj)/conf
  63. $< -r arch/$(ARCH)/Kconfig
  64. @@ -56,6 +56,9 @@
  65. allmodconfig: $(obj)/conf
  66. $< -m arch/$(ARCH)/Kconfig
  67. +no2modconfig: scripts/kconfig/conf
  68. + $< -M arch/$(ARCH)/Kconfig
  69. +
  70. defconfig: $(obj)/conf
  71. ifeq ($(KBUILD_DEFCONFIG),)
  72. $< -d arch/$(ARCH)/Kconfig
  73. @@ -77,6 +80,7 @@
  74. @echo ' randconfig - New config with random answer to all options'
  75. @echo ' defconfig - New config with default answer to all options'
  76. @echo ' allmodconfig - New config selecting modules when possible'
  77. + @echo ' no2modconfig - New config selecting modules for disabled options'
  78. @echo ' allyesconfig - New config where all options are accepted with yes'
  79. @echo ' allnoconfig - New config where all options are answered with no'