From 5e8c7cfbbc3f72c705867dd8f4e02122e97dffe5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 3 Jun 2012 14:43:20 +0200 Subject: [PATCH] synchronise with 3.5-rc1 Signed-off-by: "Yann E. MORIN" --- .version | 2 +- docs/kconfig.txt | 18 +++++++++--------- frontends/conf/conf.c | 22 ++++++++++++++++------ frontends/mconf/mconf.c | 2 +- frontends/nconf/nconf.c | 2 +- scripts/ksync.log | 4 ++++ utils/tweak | 11 +++++++---- 7 files changed, 39 insertions(+), 22 deletions(-) diff --git a/.version b/.version index 8ae84f5..cd3a387 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ -3.4.0 76e10d158efb6d4516018846f60c2ab5501900bc Saber-toothed Squirrel +3.5.0-rc1 f8f5701bdaf9134b1f90e5044a82c66324d2073f Saber-toothed Squirrel hg diff --git a/docs/kconfig.txt b/docs/kconfig.txt index 9d5f2a9..a09f1a6 100644 --- a/docs/kconfig.txt +++ b/docs/kconfig.txt @@ -53,15 +53,15 @@ KCONFIG_ALLCONFIG -------------------------------------------------- (partially based on lkml email from/by Rob Landley, re: miniconfig) -------------------------------------------------- -The allyesconfig/allmodconfig/allnoconfig/randconfig variants can -also use the environment variable KCONFIG_ALLCONFIG as a flag or a -filename that contains config symbols that the user requires to be -set to a specific value. If KCONFIG_ALLCONFIG is used without a -filename, "make *config" checks for a file named -"all{yes/mod/no/def/random}.config" (corresponding to the *config command -that was used) for symbol values that are to be forced. If this file -is not found, it checks for a file named "all.config" to contain forced -values. +The allyesconfig/allmodconfig/allnoconfig/randconfig variants can also +use the environment variable KCONFIG_ALLCONFIG as a flag or a filename +that contains config symbols that the user requires to be set to a +specific value. If KCONFIG_ALLCONFIG is used without a filename where +KCONFIG_ALLCONFIG == "" or KCONFIG_ALLCONFIG == "1", "make *config" +checks for a file named "all{yes/mod/no/def/random}.config" +(corresponding to the *config command that was used) for symbol values +that are to be forced. If this file is not found, it checks for a +file named "all.config" to contain forced values. This enables you to create "miniature" config (miniconfig) or custom config files containing just the config symbols that you are interested diff --git a/frontends/conf/conf.c b/frontends/conf/conf.c index f208f90..0dc4a2c 100644 --- a/frontends/conf/conf.c +++ b/frontends/conf/conf.c @@ -574,8 +574,15 @@ int main(int ac, char **av) case alldefconfig: case randconfig: name = getenv("KCONFIG_ALLCONFIG"); - if (name && !stat(name, &tmpstat)) { - conf_read_simple(name, S_DEF_USER); + if (!name) + break; + if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) { + if (conf_read_simple(name, S_DEF_USER)) { + fprintf(stderr, + _("*** Can't read seed configuration \"%s\"!\n"), + name); + exit(1); + } break; } switch (input_mode) { @@ -586,10 +593,13 @@ int main(int ac, char **av) case randconfig: name = "allrandom.config"; break; default: break; } - if (!stat(name, &tmpstat)) - conf_read_simple(name, S_DEF_USER); - else if (!stat("all.config", &tmpstat)) - conf_read_simple("all.config", S_DEF_USER); + if (conf_read_simple(name, S_DEF_USER) && + conf_read_simple("all.config", S_DEF_USER)) { + fprintf(stderr, + _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"), + name); + exit(1); + } break; default: break; diff --git a/frontends/mconf/mconf.c b/frontends/mconf/mconf.c index 2c6286c..f606738 100644 --- a/frontends/mconf/mconf.c +++ b/frontends/mconf/mconf.c @@ -240,7 +240,7 @@ search_help[] = N_( "Defined at drivers/pci/Kconfig:47\n" "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n" "Location:\n" - " -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n" + " -> Bus options (PCI, PCMCIA, EISA, ISA)\n" " -> PCI support (PCI [=y])\n" " -> PCI access mode ( [=y])\n" "Selects: LIBCRC32\n" diff --git a/frontends/nconf/nconf.c b/frontends/nconf/nconf.c index 73070cb..8c0eb65 100644 --- a/frontends/nconf/nconf.c +++ b/frontends/nconf/nconf.c @@ -223,7 +223,7 @@ search_help[] = N_( "Defined at drivers/pci/Kconfig:47\n" "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n" "Location:\n" -" -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n" +" -> Bus options (PCI, PCMCIA, EISA, ISA)\n" " -> PCI support (PCI [ = y])\n" " -> PCI access mode ( [ = y])\n" "Selects: LIBCRC32\n" diff --git a/scripts/ksync.log b/scripts/ksync.log index e69de29..03dadd5 100644 --- a/scripts/ksync.log +++ b/scripts/ksync.log @@ -0,0 +1,4 @@ +MCA: delete all remaining traces of microchannel bus support. +scripts/config: properly report and set string options +kbuild: all{no,yes,mod,def,rand}config only read files when instructed to. +kconfig: Add error handling to KCONFIG_ALLCONFIG diff --git a/utils/tweak b/utils/tweak index a7c7c4b..ed6653e 100755 --- a/utils/tweak +++ b/utils/tweak @@ -107,7 +107,8 @@ while [ "$1" != "" ] ; do ;; --set-str) - set_var "CONFIG_$ARG" "CONFIG_$ARG=\"$1\"" + # sed swallows one level of escaping, so we need double-escaping + set_var "CONFIG_$ARG" "CONFIG_$ARG=\"${1//\"/\\\\\"}\"" shift ;; @@ -124,9 +125,11 @@ while [ "$1" != "" ] ; do if [ $? != 0 ] ; then echo undef else - V="${V/CONFIG_$ARG=/}" - V="${V/\"/}" - echo "$V" + V="${V/#CONFIG_$ARG=/}" + V="${V/#\"/}" + V="${V/%\"/}" + V="${V/\\\"/\"}" + echo "${V}" fi fi ;; -- 2.39.5