| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 30 May 2011 20:24:05 -0400
From: Arnaud Lacombe <lacombar@...il.com>
To: David Woodhouse <dwmw2@...radead.org>
Cc: "Ted Ts'o" <tytso@....edu>, Ingo Molnar <mingo@...e.hu>,
x86@...nel.org, linux-kernel@...r.kernel.org,
linux-kbuild@...r.kernel.org
Subject: Re: [PATCH] Enable 'make CONFIG_FOO=y oldconfig'
Hi,
On Mon, May 30, 2011 at 6:39 PM, David Woodhouse <dwmw2@...radead.org> wrote:
> This allows you to set (and clear) config options on the make command
> line, for all config targets. For example:
>
> make CONFIG_64BIT=n randconfig
> make CONFIG_64BIT=n allmodconfig
> make CONFIG_64BIT=y CONFIG_SATA_MV=y oldconfig
>
> Signed-off-by: David Woodhouse <David.Woodhouse@...el.com>
>
This does not seem to work with:
% make CONFIG_ARCH_OMAP=y ARCH=arm allnoconfig
HOSTCC scripts/kconfig/conf.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf --allnoconfig Kconfig
#
# configuration written to .config
#
% grep CONFIG_ARCH_OMAP .config
# CONFIG_ARCH_OMAP is not set
It would seem that the underlying symbol is not visible, triggering
the failure of sym_set_tristate_value().
- Arnaud
> diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
> index 006ad81..2b91e3b 100644
> --- a/scripts/kconfig/conf.c
> +++ b/scripts/kconfig/conf.c
> @@ -456,7 +456,7 @@ static struct option long_opts[] = {
> {NULL, 0, NULL, 0}
> };
>
> -int main(int ac, char **av)
> +int main(int ac, char **av, char **ep)
> {
> int opt;
> const char *name;
> @@ -563,6 +563,11 @@ int main(int ac, char **av)
> break;
> }
>
> + for ( ; *ep; ep++) {
> + if (!strncmp(*ep, CONFIG_, strlen(CONFIG_)))
> + conf_set_symbol_from_env(*ep);
> + }
> +
> if (sync_kconfig) {
> if (conf_get_changed()) {
> name = getenv("KCONFIG_NOSILENTUPDATE");
> diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
> index 61c35bf..e8ff902 100644
> --- a/scripts/kconfig/confdata.c
> +++ b/scripts/kconfig/confdata.c
> @@ -338,6 +338,47 @@ setsym:
> return 0;
> }
>
> +void conf_set_symbol_from_env(char *str)
> +{
> + char *p = strchr(str, '=');
> + struct symbol *sym;
> + int def = S_DEF_USER;
> + int def_flags = SYMBOL_DEF << def;
> +
> + if (!p)
> + return;
> +
> + *p = 0;
> + sym = sym_find(str + strlen(CONFIG_));
> + *p++ = '=';
> +
> + if (!sym)
> + return;
> +
> + if (!sym_set_string_value(sym, p))
> + return;
> + conf_message("CONFIG_%s set to %s from environment", sym->name, p);
> + if (sym && sym_is_choice_value(sym)) {
> + struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
> + switch (sym->def[def].tri) {
> + case no:
> + break;
> + case mod:
> + if (cs->def[def].tri == yes) {
> + conf_warning("%s creates inconsistent choice state", sym->name);
> + cs->flags &= ~def_flags;
> + }
> + break;
> + case yes:
> + if (cs->def[def].tri != no)
> + conf_warning("override: %s changes choice state", sym->name);
> + cs->def[def].val = sym;
> + break;
> + }
> + cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
> + }
> +}
> +
> int conf_read(const char *name)
> {
> struct symbol *sym, *choice_sym;
> diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
> index febf0c9..bf6fade 100644
> --- a/scripts/kconfig/lkc.h
> +++ b/scripts/kconfig/lkc.h
> @@ -91,6 +91,7 @@ char *conf_get_default_confname(void);
> void sym_set_change_count(int count);
> void sym_add_change_count(int count);
> void conf_set_all_new_symbols(enum conf_def_mode mode);
> +void conf_set_symbol_from_env(char *);
>
> /* confdata.c and expr.c */
> static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
>
>
> --
> dwmw2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists