Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da85d342 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kconfig changes from Michal Marek:

 - Error handling for make KCONFIG_ALLCONFIG=<...> all*config plus a fix
   for a bug that was exposed by this

 - Fix for the script/config utility.

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  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
parents 1347a2ce d6686da8

Documentation/kbuild/kconfig.txt

+9 −9
Original line number Diff line number Diff line
@@ -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

scripts/config

+7 −4
Original line number Diff line number Diff line
@@ -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

		;;

scripts/kconfig/conf.c

+16 −6
Original line number Diff line number Diff line
@@ -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;