From patchwork Fri Jan 15 14:48:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8041601 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 604D09F716 for ; Fri, 15 Jan 2016 14:51:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D42720439 for ; Fri, 15 Jan 2016 14:51:16 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 899DB203E1 for ; Fri, 15 Jan 2016 14:51:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aK5gT-0007fI-Qb; Fri, 15 Jan 2016 14:49:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aK5gS-0007fD-Jo for xen-devel@lists.xen.org; Fri, 15 Jan 2016 14:49:00 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id C5/6A-02499-BD609965; Fri, 15 Jan 2016 14:48:59 +0000 X-Env-Sender: prvs=815b692d9=Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1452869337!8636978!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36961 invoked from network); 15 Jan 2016 14:48:59 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 15 Jan 2016 14:48:59 -0000 X-IronPort-AV: E=Sophos;i="5.22,299,1449532800"; d="scan'208";a="325416884" From: Ian Campbell To: , Doug Goldstein Date: Fri, 15 Jan 2016 14:48:55 +0000 Message-ID: <1452869335-28853-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH RFC] xen/Kconfig: Use olddefconfig not silentoldconfig to update .config X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP RFC RFC RFC RFC RFC RFC RFC RFC RFC RFC RFC BECAUSE THIS BREAKS CLEAN BUILDS WITH: In file included from :0:0: /local/scratch/ianc/devel/arm/xen.git/xen/include/xen/config.h:10:32: fatal error: generated/autoconf.h: No such file or directory #include I'm not sure why given the descriptions of olddefconfig and silentoldconfig below. DO NOT APPLY (OF COURSE!) RFC RFC RFC RFC RFC RFC RFC RFC RFC RFC RFC When pulling my git tree over a commit which adds new Kconfig questions the incremental build still stops and asks me the new questions: + make -C xen XEN_TARGET_ARCH=arm64 DESTDIR=/tmp/tmprg7d63 debug=y CROSS_COMPILE=aarch64-linux-gnu- -j12 CONFIG_EARLY_PRINTK=fastmodel install make: Entering directory '/local/scratch/ianc/devel/arm/xen.git/xen' make -f /local/scratch/ianc/devel/arm/xen.git/xen/tools/kconfig/Makefile.kconfig ARCH=arm64 silentoldconfig make[1]: Entering directory '/local/scratch/ianc/devel/arm/xen.git/xen' gcc -Wp,-MD,tools/kconfig/.conf.o.d -I/usr/include/ncursesw -DCURSES_LOC="" -DNCURSES_WIDECHAR=1 -DLOCALE -c -o tools/kconfig/conf.o tools/kconfig/conf.c gcc -Wp,-MD,tools/kconfig/.zconf.tab.o.d -I/usr/include/ncursesw -DCURSES_LOC="" -DNCURSES_WIDECHAR=1 -DLOCALE -Itools/kconfig -c -o tools/kconfig/zconf.tab.o tools/kconfig/zconf.tab.c gcc -o tools/kconfig/conf tools/kconfig/conf.o tools/kconfig/zconf.tab.o tools/kconfig/conf -s --silentoldconfig Kconfig * * Restart config... * * * Architecture Features * Maximum number of physical CPUs (NR_CPUS) [128] (NEW) This is in contrast to a fully clean build which just gets on with using the defconfig. According to "make -C xen/tools/kconfig/ help" it seems like we want olddefconfig rather than silentoldconfig: oldconfig - Update current config utilising a provided .config as base [...] silentoldconfig - Same as oldconfig, but quietly, additionally update deps [...] olddefconfig - Same as silentoldconfig but sets new symbols to their default value With this changed it now doesn't ask me any questions on an incremental build when a new question is added. Note however that AFAICT in no case would this pickup a change to the default of an existing option (how could it know?). I think we can live with this. Signed-off-by: Ian Campbell Cc: Doug Goldstein --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 3699b20..f8f3bb4 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -239,7 +239,7 @@ $(kconfig): $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) $@ include/config/%.conf: include/config/auto.conf.cmd $(KCONFIG_CONFIG) - $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) silentoldconfig + $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) olddefconfig # Allow people to just run `make` as before and not force them to configure $(KCONFIG_CONFIG):