From patchwork Tue Oct 29 18:17:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 11218413 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B09B1515 for ; Tue, 29 Oct 2019 18:17:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2290520679 for ; Tue, 29 Oct 2019 18:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730825AbfJ2SRS (ORCPT ); Tue, 29 Oct 2019 14:17:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34194 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730754AbfJ2SRS (ORCPT ); Tue, 29 Oct 2019 14:17:18 -0400 Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3B88796E6 for ; Tue, 29 Oct 2019 18:17:17 +0000 (UTC) Received: by mail-yb1-f199.google.com with SMTP id w69so11162226ybe.18 for ; Tue, 29 Oct 2019 11:17:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pSPCRP5KhBuHaPqDT4xlggRtohHjOrWiMoN28gbXXPY=; b=sDkTdTXZRB+028OewL/WYEKYpgVMWMfXH03EE82B6lpLShjU/s2X8HRZdhf9kc4hvu xttFcLLjcs1+H8TqGPyLlibJY8qd1WAAKOg4+ejD9iFAGZLIkhEL6dzbtXUDa39r40/T B7eSQ1dWmVlhnvoTKD/TsuvmGPkNFkTTYG6tnvoiZ9NANymLA8v1mWCas9Fi7Go+p22s mHbVa1x0RIaCxITvbWXPMqiEW1uSvY5887++Ylf/TBhMR7jyVsPBrlJj7YIhauias+Df DOJB2dtk/P+4xp2Cm4XiJbWkG2g2RLiqrJtAsbYsz4OCOheZY5y5hk5V4w+0dLSkk17l M4cQ== X-Gm-Message-State: APjAAAWpxAYk5wJHGkvy+O0J04NXozn3zUUZZemMhMdrw7+fbTyd1fhz zAI++Q0KsLF9pWJq+ieYqgaNwYTIUu4RniOnkEFyiKAlxZzPNlKIDUF2bA1QWqq1Pxfcet25KNH 6PWTKZfxVEFwd9dQacmMgKLgC X-Received: by 2002:a25:cfc4:: with SMTP id f187mr20583218ybg.496.1572373036875; Tue, 29 Oct 2019 11:17:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEsmP4QaGFt68Y9OfWI8X1RtudXuSG270aSNTPDOkIfwOpRINoRdtD8cssOMB4mTjwKTWKaQ== X-Received: by 2002:a25:cfc4:: with SMTP id f187mr20583169ybg.496.1572373036358; Tue, 29 Oct 2019 11:17:16 -0700 (PDT) Received: from labbott-redhat.redhat.com (pool-96-235-39-235.pitbpa.fios.verizon.net. [96.235.39.235]) by smtp.gmail.com with ESMTPSA id r67sm8628696ywr.48.2019.10.29.11.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2019 11:17:15 -0700 (PDT) From: Laura Abbott To: Masahiro Yamada Cc: Laura Abbott , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, jcline@redhat.com, dzickus@redhat.com Subject: [RFC PATCH] kconfig: Add option to get the full help text with listnewconfig Date: Tue, 29 Oct 2019 14:17:02 -0400 Message-Id: <20191029181702.21460-1-labbott@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org make listnewconfig will list the individual options that need to be set. This is useful but there's no easy way to get the help text associated with the options at the same time. Introduce a new targe 'make extendedlistnewconfig' which lists the full help text of all the new options as well. This makes it easier to automatically generate changes that are easy for humans to review. This command also adds markers between each option for easier parsing. Signed-off-by: Laura Abbott --- Red Hat has been relying on some external libraries that have a tendency to break to get the help text for all new config options. I'd really like an in tree way to get the help text so we can automatically generate patches for people to reveiw new config options. I'm open to other approaches that let us script getting the help text as well. --- scripts/kconfig/Makefile | 5 ++++- scripts/kconfig/conf.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ef2f2336c469..aaaf1f62300c 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -66,7 +66,9 @@ localyesconfig localmodconfig: $(obj)/conf # syncconfig has become an internal implementation detail and is now # deprecated for external use simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \ - alldefconfig randconfig listnewconfig olddefconfig syncconfig + alldefconfig randconfig listnewconfig olddefconfig syncconfig \ + extendedlistnewconfig + PHONY += $(simple-targets) $(simple-targets): $(obj)/conf @@ -134,6 +136,7 @@ help: @echo ' alldefconfig - New config with all symbols set to default' @echo ' randconfig - New config with random answer to all options' @echo ' listnewconfig - List new options' + @echo ' extendedlistnewconfig - List new options' @echo ' olddefconfig - Same as oldconfig but sets new symbols to their' @echo ' default value without prompting' @echo ' kvmconfig - Enable additional options for kvm guest kernel support' diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 40e16e871ae2..7aeb77374d9a 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -32,6 +32,7 @@ enum input_mode { defconfig, savedefconfig, listnewconfig, + extendedlistnewconfig, olddefconfig, }; static enum input_mode input_mode = oldaskconfig; @@ -434,6 +435,11 @@ static void check_conf(struct menu *menu) printf("%s%s=%s\n", CONFIG_, sym->name, str); } } + } else if (input_mode == extendedlistnewconfig) { + printf("-----\n"); + print_help(menu); + printf("-----\n"); + } else { if (!conf_cnt++) printf("*\n* Restart config...\n*\n"); @@ -459,6 +465,7 @@ static struct option long_opts[] = { {"alldefconfig", no_argument, NULL, alldefconfig}, {"randconfig", no_argument, NULL, randconfig}, {"listnewconfig", no_argument, NULL, listnewconfig}, + {"extendedlistnewconfig", no_argument, NULL, extendedlistnewconfig}, {"olddefconfig", no_argument, NULL, olddefconfig}, {NULL, 0, NULL, 0} }; @@ -469,6 +476,7 @@ static void conf_usage(const char *progname) printf("Usage: %s [-s] [option] \n", progname); printf("[option] is _one_ of the following:\n"); printf(" --listnewconfig List new options\n"); + printf(" --extendedlistnewconfig List new options and help text\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(" --syncconfig Similar to oldconfig but generates configuration in\n" @@ -543,6 +551,7 @@ int main(int ac, char **av) case allmodconfig: case alldefconfig: case listnewconfig: + case extendedlistnewconfig: case olddefconfig: break; case '?': @@ -576,6 +585,7 @@ int main(int ac, char **av) case oldaskconfig: case oldconfig: case listnewconfig: + case extendedlistnewconfig: case olddefconfig: conf_read(NULL); break; @@ -657,6 +667,7 @@ int main(int ac, char **av) /* fall through */ case oldconfig: case listnewconfig: + case extendedlistnewconfig: case syncconfig: /* Update until a loop caused no more changes */ do { @@ -675,7 +686,7 @@ int main(int ac, char **av) defconfig_file); return 1; } - } else if (input_mode != listnewconfig) { + } else if (input_mode != listnewconfig && input_mode != extendedlistnewconfig) { if (!no_conf_write && conf_write(NULL)) { fprintf(stderr, "\n*** Error during writing of the configuration.\n\n"); exit(1);