From patchwork Mon Apr 18 09:23:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Izard X-Patchwork-Id: 611623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3qpN4J3p5nz9t3w for ; Mon, 18 Apr 2016 19:23:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=gD0Wf2Xn; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 258098A033; Mon, 18 Apr 2016 09:23:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id weSABMpRqt3q; Mon, 18 Apr 2016 09:23:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EA5518AF7B; Mon, 18 Apr 2016 09:23:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E35B71C1510 for ; Mon, 18 Apr 2016 09:23:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DB74995DDB for ; Mon, 18 Apr 2016 09:23:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SCtFsF-bYgSa for ; Mon, 18 Apr 2016 09:23:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id CE99A95DC0 for ; Mon, 18 Apr 2016 09:23:31 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id n3so22881168wmn.1 for ; Mon, 18 Apr 2016 02:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F9Mw3iLc778JsVfY6S+YgDFSo6UKQP2284EBzKrU2BY=; b=gD0Wf2XnWMJ7bnf3+1Ld5zeUooM53U4kQ9m/SRT4iVQwhmoRKIgWW3OlUjqtt1B5vY KTa4oOs+oIgs78UQ+WWuXnVXZBxaLdwd7mSEJ3g0hAZBGBJnuzMXcdHEAaTfPu0NFmP3 FqQwr3aJDqOucil4oUDwr7zyyribcgBo0USNTkAia5JLah7TMqxhI4sJfyOkP+SD5hRf vwdoWuWmyV+qTSnrFzfGUdaEMSyWqLThtI7couBpa/uSbf5u763QdLCJuBJ71rvv4oUM E0Gu7BPpFRydDDxO+WkJcEE/cX2PXewdT1uwBnvGm7Szlw9tpbdo9lWl//yuVnWibJJQ EI6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F9Mw3iLc778JsVfY6S+YgDFSo6UKQP2284EBzKrU2BY=; b=A8ytapGaRewrn8FqUO0JfziXHN3tZAyNkeabrXFQ5KUcaw7u3+yg/CSJ+fknPovnV4 zwXeCnR6XwCoRfFf5JyHVQCBVNiTVYn5rG6PNW5jtz810IvnwG4g5rEJtS1k96S39M3R g8Teed7snVOkm+4J2IjaP8GHZMOEBt794eQJwUP1NllCQMTTBOA4awA9yHc2hnCRPd+j n/BnFlCwM2vo4/g/fBBmztnmwzRYPy0DugbvHJIgEet1eJc5XcCZiAFBHFox5QfdzKjl adXS7uISlaAl99q3u9oMBDbcsxjqEMqEUNDRxWOozhrk4KrhIhTzUDqu57gUjxKGyTZZ UMcg== X-Gm-Message-State: AOPr4FX+MW9spFvmgnLZk2siJuxn8nGdp8mhbtyHNU/jCjaPpEZCUBX4YLcemmrMFYQOiQ== X-Received: by 10.194.202.195 with SMTP id kk3mr34087344wjc.159.1460971410458; Mon, 18 Apr 2016 02:23:30 -0700 (PDT) Received: from localhost.localdomain (ram94-11-88-187-113-157.fbx.proxad.net. [88.187.113.157]) by smtp.gmail.com with ESMTPSA id r204sm36812871wmg.20.2016.04.18.02.23.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Apr 2016 02:23:29 -0700 (PDT) From: Romain Izard To: buildroot@buildroot.org Date: Mon, 18 Apr 2016 11:23:03 +0200 Message-Id: <1460971383-10595-4-git-send-email-romain.izard.pro@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460971383-10595-1-git-send-email-romain.izard.pro@gmail.com> References: <1460971383-10595-1-git-send-email-romain.izard.pro@gmail.com> Cc: Thomas Petazzoni , Romain Izard , "Yann E. MORIN" Subject: [Buildroot] [PATCH v4 3/3] core/pkg-kconfig: Use oldnoconfig when possible X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Using 'yes "" | make oldconfig' to regenerate a .config file from an existing defconfig does not work reliably in all cases. Specifically, it does not work well with tristate choice entries. The correct way to do it is to use 'make olddefconfig', but this target is not supported in projects that use an old version of kconfig. As most projects do not use tristate entries, there is no need for them to upgrade. 'oldnoconfig' is an alias for 'olddefconfig', but it also is the only name for this target between Linux versions 2.6.36 and 3.6. Try to use 'oldnoconfig' by default, using 'oldconfig' as a fallback Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Romain Izard --- Changelog: v1: New patch v2: Use oldnoconfig instead of olddefconfig Fix silent mode Change the pattern in both places where it is used Use a macro to avoid redundancy v3: Do not use $(call ...) Use the $(2)_KCONFIG_MAKE variable v4: No change package/pkg-kconfig.mk | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 4033915..e04cfd5 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -60,18 +60,28 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch $(2)_KCONFIG_MAKE = \ $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS) +# The correct way to regenerate a .config file is to use 'make olddefconfig'. +# For historical reasons, the target name is 'oldnoconfig' between Linux kernel +# versions 2.6.36 and 3.6, and remains as an alias in later versions. +# In older versions, and in some other projects that use kconfig, the target is +# not supported at all, and we use 'yes "" | make oldconfig' as a fallback +# only, as this can fail in complex cases. +define $(2)_REGEN_DOT_CONFIG + $$(Q)$$($(2)_KCONFIG_MAKE) oldnoconfig || \ + (yes "" | $$($(2)_KCONFIG_MAKE) oldconfig) +endef + # The specified source configuration file and any additional configuration file # fragments are merged together to .config, after the package has been patched. # Since the file could be a defconfig file it needs to be expanded to a -# full .config first. We use 'make oldconfig' because this can be safely -# done even when the package does not support defconfigs. +# full .config first. $$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES) $$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \ $$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \ cp $$($(2)_KCONFIG_FILE) $$(@)) $$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \ $$(@) $$($(2)_KCONFIG_FRAGMENT_FILES) - $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig + $$($(2)_REGEN_DOT_CONFIG) # If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is # already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add @@ -82,7 +92,7 @@ $$($(2)_DIR)/.config: | $(1)-patch # The exact rules are specified by the package .mk file. define $(2)_FIXUP_DOT_CONFIG $$($(2)_KCONFIG_FIXUP_CMDS) - $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig + $$($(2)_REGEN_DOT_CONFIG) $$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done endef