From patchwork Wed Feb 28 00:15:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 129875 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp412897lja; Tue, 27 Feb 2018 16:17:16 -0800 (PST) X-Google-Smtp-Source: AH8x226AUMYKsOp20/53YJakdbN53wKVyaMolNCSbBBq3k9KRknNkp0iGc/Wc5CBAP9a9PmCWO+u X-Received: by 10.99.45.194 with SMTP id t185mr11422624pgt.267.1519777036644; Tue, 27 Feb 2018 16:17:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519777036; cv=none; d=google.com; s=arc-20160816; b=oquXseDgiIHKf3H1hJamhPBbpcRkr9Wxjk8Wajen8rdaP4COte7wlzL69QTlkf8aaK 46ayh/a78tZ62A1x3rYEnZ3p7JvuUVkflCxm6cAnak6dtVlqsoKOOxz5mGDTk5LEfN7A Kl6352YY6BMuzKLZqOzGOsQ4giVnEU+6KqqomaRZxBRoeyWO8MVRXPZTuKik8eHp2UzS B0n+hQmRo1bQ5WASB63GzT6hE7soTe2FsH+2cyzGX7/WdcUaD0IrBalcxJEGtS6qcvgE 63FDPl0aEqBWqRwRzP7WeSxtrS0ebezzQgjyG6VoBdYbMavmvFfOjrgQYlCYtNcWXf8p xdsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=1OqJHMwZpZu9T5xPrKE5JaVToxxxYpxwwNweR+yPBv0=; b=WC/XQTfqoPyTL+T5F2w8KZHK6EJ+G8gvG1l6xG5ohzeZULUg3tbn/LY3/1IvY4IALv bOa6/c0wO6RVXv70MmWbZXcNSI1JuyXwox61sjNI4V4syiW+e+zQEvXDiT4ymFPwZl8G BK2zVdjPM3MrKTC+FKU6Ib7exwY5mzepUhvOfNFB/pqjkmCcyUXNN0cGM/vkmiE6zjWL 24OhKyBThN/MMLogX70oBLXDCoqkGrs+PKKAr0fy7ZH4/eXFNba31IudXRY+aTBE4MD2 7DwcEclE1TJTD2mHr+ngcNCuwMcWhSXuVsEy8I6iTH/j9OJX/7mnz4SbePdirukJifLh mziw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tOZIoBMT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v23-v6si284455plo.276.2018.02.27.16.17.16; Tue, 27 Feb 2018 16:17:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tOZIoBMT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752018AbeB1ARM (ORCPT + 28 others); Tue, 27 Feb 2018 19:17:12 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:24522 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751813AbeB1AQz (ORCPT ); Tue, 27 Feb 2018 19:16:55 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-09.nifty.com with ESMTP id w1S0Fahq000353; Wed, 28 Feb 2018 09:15:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w1S0Fahq000353 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519776941; bh=1OqJHMwZpZu9T5xPrKE5JaVToxxxYpxwwNweR+yPBv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tOZIoBMT/sP3UvdEfBffXfFTmSvqhoQjLKtCsEGV2nxIbqD7vkqH/U6uX85UK/HCi Lf0i78qvgsmxLhBoqpFhz9NvVGbEzi2ZWgWPQ8rRB8hzSvDBu54AavzG9aIy2wbqK/ mLfu7RUe1zJ7x84QpSCA93aQdoPGuZ3RSfT6SKvTpDVYgOoOaycvXqaTrb+GiJkiPr hJFvXNOSXjyeHM/BvCajjpwpkdEhSi9V3i6epeuR/DSdFRd7ewTOSNIB18TZGm00Zo VuR68061BuXwYQc3cAq+a+pjqCCFOFgWNcAl8fvY0lnlyUC3lhgYUOpmlFfgneyWSZ VkxGhXfU991hQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Marc Herbert , Ulf Magnusson , Sam Ravnborg , Masahiro Yamada , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Corbet , Michal Marek Subject: [PATCH v2 6/6] kconfig: rename silentoldconfig to syncconfig Date: Wed, 28 Feb 2018 09:15:26 +0900 Message-Id: <1519776926-30459-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519776926-30459-1-git-send-email-yamada.masahiro@socionext.com> References: <1519776926-30459-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As commit cedd55d49dee ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help") mentioned, 'silentoldconfig' is a historical misnomer. That commit removed it from help and docs since it is an internal interface. If so, it should be allowed to rename it to something more intuitive. 'syncconfig' is the one I came up with because it updates the .config if necessary, then synchronize other files with it. Signed-off-by: Masahiro Yamada --- Changes in v2: - newly added Documentation/kbuild/kconfig.txt | 2 +- Makefile | 2 +- scripts/kconfig/Makefile | 4 ++-- scripts/kconfig/conf.c | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) -- 2.7.4 diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt index bbc99c0..7233118 100644 --- a/Documentation/kbuild/kconfig.txt +++ b/Documentation/kbuild/kconfig.txt @@ -119,7 +119,7 @@ Examples: 15% of tristates will be set to 'y', 15% to 'm', 70% to 'n' ______________________________________________________________________ -Environment variables for 'silentoldconfig' +Environment variables for 'syncconfig' KCONFIG_NOSILENTUPDATE -------------------------------------------------- diff --git a/Makefile b/Makefile index 8706bf2..ea23d9b 100644 --- a/Makefile +++ b/Makefile @@ -598,7 +598,7 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; # include/generated/ and include/config/. Update them if .config is newer than # include/config/auto.conf (which mirrors .config). include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd - $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig + $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig else # external modules needs include/generated/autoconf.h and include/config/auto.conf # but do not care if they are up-to-date. Use auto.conf to trigger the test diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index bf9289a..988258a 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -3,7 +3,7 @@ # Kernel configuration targets # These targets are used from top-level makefile -PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \ +PHONY += xconfig gconfig menuconfig config syncconfig update-po-config \ localmodconfig localyesconfig ifdef KBUILD_KCONFIG @@ -36,7 +36,7 @@ nconfig: $(obj)/nconf # This has become an internal implementation detail and is now deprecated # for external use. -silentoldconfig: $(obj)/conf +syncconfig: $(obj)/conf $(Q)mkdir -p include/config include/generated $(Q)test -e include/generated/autoksyms.h || \ touch include/generated/autoksyms.h diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 11a4e45..4e08121 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -23,7 +23,7 @@ static void check_conf(struct menu *menu); enum input_mode { oldaskconfig, - silentoldconfig, + syncconfig, oldconfig, allnoconfig, allyesconfig, @@ -100,7 +100,7 @@ static int conf_askvalue(struct symbol *sym, const char *def) switch (input_mode) { case oldconfig: - case silentoldconfig: + case syncconfig: if (sym_has_value(sym)) { printf("%s\n", def); return 0; @@ -293,7 +293,7 @@ static int conf_choice(struct menu *menu) printf("[1-%d?]: ", cnt); switch (input_mode) { case oldconfig: - case silentoldconfig: + case syncconfig: if (!is_new) { cnt = def; printf("%d\n", cnt); @@ -441,7 +441,7 @@ static void check_conf(struct menu *menu) static struct option long_opts[] = { {"oldaskconfig", no_argument, NULL, oldaskconfig}, {"oldconfig", no_argument, NULL, oldconfig}, - {"silentoldconfig", no_argument, NULL, silentoldconfig}, + {"syncconfig", no_argument, NULL, syncconfig}, {"defconfig", optional_argument, NULL, defconfig}, {"savedefconfig", required_argument, NULL, savedefconfig}, {"allnoconfig", no_argument, NULL, allnoconfig}, @@ -468,8 +468,8 @@ static void conf_usage(const char *progname) printf(" --listnewconfig List new options\n"); printf(" --oldaskconfig Start a new configuration using a line-oriented program\n"); printf(" --oldconfig Update a configuration using a provided .config as base\n"); - printf(" --silentoldconfig Similar to oldconfig but generates configuration in\n" - " include/{generated/,config/} (oldconfig used to be more verbose)\n"); + printf(" --syncconfig Similar to oldconfig but generates configuration in\n" + " include/{generated/,config/}\n"); printf(" --olddefconfig Same as oldconfig but sets new symbols to their default value\n"); printf(" --oldnoconfig An alias of olddefconfig\n"); printf(" --defconfig New config with default defined in \n"); @@ -501,7 +501,7 @@ int main(int ac, char **av) } input_mode = (enum input_mode)opt; switch (opt) { - case silentoldconfig: + case syncconfig: sync_kconfig = 1; break; case defconfig: @@ -583,7 +583,7 @@ int main(int ac, char **av) } break; case savedefconfig: - case silentoldconfig: + case syncconfig: case oldaskconfig: case oldconfig: case listnewconfig: @@ -667,7 +667,7 @@ int main(int ac, char **av) /* fall through */ case oldconfig: case listnewconfig: - case silentoldconfig: + case syncconfig: /* Update until a loop caused no more changes */ do { conf_cnt = 0; @@ -680,7 +680,7 @@ int main(int ac, char **av) } if (sync_kconfig) { - /* silentoldconfig is used during the build so we shall update autoconf. + /* syncconfig is used during the build so we shall update autoconf. * All other commands are only used to generate a config. */ if (conf_get_changed() && conf_write(NULL)) {