synchronise with 3.5-rc1

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.version b/.version
index 8ae84f5a9e68a2500e4a9d32052f8fcc9d6b60a6..cd3a387e555e965314595a9abec906dbc90cde06 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-3.4.0 76e10d158efb6d4516018846f60c2ab5501900bc Saber-toothed Squirrel
+3.5.0-rc1 f8f5701bdaf9134b1f90e5044a82c66324d2073f Saber-toothed Squirrel

 hg
 hg

diff --git a/docs/kconfig.txt b/docs/kconfig.txt
index 9d5f2a90dca96b600c1ee1bd107620c6dd1e4523..a09f1a6a830c0fc59c65c3880c6bf3f3129a9591 100644 (file)
--- 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)
 --------------------------------------------------
 --------------------------------------------------
 (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
 
 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 f208f900ed3a8747f9bfd949b2221000d5021607..0dc4a2c779b119ec51e2eb5b3f17c5a4d02645fb 100644 (file)
--- 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");
        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) {
                        break;
                }
                switch (input_mode) {


@@ -586,10 +593,13 @@ int main(int ac, char **av)
                case randconfig:        name = "allrandom.config"; break;
                default: break;
                }
                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;
                break;
        default:
                break;

diff --git a/frontends/mconf/mconf.c b/frontends/mconf/mconf.c
index 2c6286c0bc1ac70ef190bdbd031905593070c933..f606738d421d99c29f7321236e3eebcd2ac6a760 100644 (file)
--- 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"
        "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 (<choice> [=y])\n"
        "Selects: LIBCRC32\n"
        "    -> PCI support (PCI [=y])\n"
        "      -> PCI access mode (<choice> [=y])\n"
        "Selects: LIBCRC32\n"

diff --git a/frontends/nconf/nconf.c b/frontends/nconf/nconf.c
index 73070cb0b6de50289bd1e5b2d17217d691669a37..8c0eb65978c95aecedb73a7e71c6c4d788fe2255 100644 (file)
--- 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"
 "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 (<choice> [ = y])\n"
 "Selects: LIBCRC32\n"
 "    -> PCI support (PCI [ = y])\n"
 "      -> PCI access mode (<choice> [ = y])\n"
 "Selects: LIBCRC32\n"

diff --git a/scripts/ksync.log b/scripts/ksync.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..03dadd54417c5d1cc7c00ab40e8779384b839e7b 100644 (file)
--- 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 a7c7c4b8e957311196f9b2eabef414ceaa144555..ed6653ef9702aa5320756537bb942e8a35123cb4 100755 (executable)
--- a/utils/tweak
+++ b/utils/tweak
@@ -107,7 +107,8 @@ while [ "$1" != "" ] ; do
                ;;
 
        --set-str)
                ;;
 
        --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
                ;;
 
                shift
                ;;
 


@@ -124,9 +125,11 @@ while [ "$1" != "" ] ; do
                        if [ $? != 0 ] ; then
                                echo undef
                        else
                        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
                ;;
                        fi
                fi
                ;;