From patchwork Tue Mar 29 10:11:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Izard X-Patchwork-Id: 602827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3qZ65W4F1Sz9s6n for ; Tue, 29 Mar 2016 21:12:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=hm0W2tTv; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 78DB38BEF9; Tue, 29 Mar 2016 10:12:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MB145twslScV; Tue, 29 Mar 2016 10:12:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id CA2558BE67; Tue, 29 Mar 2016 10:12:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8419F1C0DE5 for ; Tue, 29 Mar 2016 10:12:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7DC4B32263 for ; Tue, 29 Mar 2016 10:12:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hVafQ6i1dfnu for ; Tue, 29 Mar 2016 10:12:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by silver.osuosl.org (Postfix) with ESMTPS id 5096528EC4 for ; Tue, 29 Mar 2016 10:12:00 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 139so3766752wmn.2 for ; Tue, 29 Mar 2016 03:12:00 -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=jo4il53yd5Cee8oIoyEUPge4n0P2SZDj8X1ve2lUQrs=; b=hm0W2tTvTSJjPK2EDgbgNUyUrkeK+8UUkUy/IydtBcTiDCSrVIlDaKGqxrytfRoXTQ nfqPw/+X/1PXEqFn87IsHn3XWcoxtCsacXMC3L0y3RV+HQLwT629fo4BvauK8oAzx6xY NimtYehfCrUGxBtoj7pawAceGHG90JtVmOYYQgMK4692lSceh2r+2uonAViN5GVaowfK TwL3NA0Ce13tbLgZi0FqE8sqx1vqgivKVkRGrTAPYRWfe+YDYq9nqJMJDd2RxNEqi7wn A1BqamYAOmEcj8iKUpgRKlh9bhW+h5KSnuIvbCfdy6ThGKDv6TOZxjVkl4euxq2Ifvlb kdkg== 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=jo4il53yd5Cee8oIoyEUPge4n0P2SZDj8X1ve2lUQrs=; b=DkVWEcmcx7upJVFmCdRCtPPFXvD1Fi38UtPwC88toL1+1haU+n/W07lv5fJxgipxOb J27hFc9CUESeoMqgZJp7fRsn1APEyWHbvRHFkv9F1Urcrln+Dr34t3pKvXBeAF2WMCUx GtIRrGfXKSMti2wdj+DN/RUrtUV6LEn4SwDq1PqFChBUObysdjH8YX7Fxzq9t974wciW 6SkXFmajnWmnSbqxRW8c8oJTE3+Sp3gqKV9cKstdx9f0QQxjjxOkg8D++EsFGvPhASXc W4aoBOIs9aDoSqMHPqIBpyPRzdc9adJ/jsrODlFYYkklYF9i+azu0a+FsUfAJ3OpXsCv 33PQ== X-Gm-Message-State: AD7BkJITAgj6FUrIa//+CyIYhq7PH1DzdpWLK98cIdlNXvluofIW4cvLuVer3c6lExhL5Q== X-Received: by 10.194.22.68 with SMTP id b4mr1695442wjf.158.1459246318830; Tue, 29 Mar 2016 03:11:58 -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 y72sm13999915wmh.21.2016.03.29.03.11.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Mar 2016 03:11:58 -0700 (PDT) From: Romain Izard To: buildroot@buildroot.org Date: Tue, 29 Mar 2016 12:11:42 +0200 Message-Id: <1459246302-21837-3-git-send-email-romain.izard.pro@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459246302-21837-1-git-send-email-romain.izard.pro@gmail.com> References: <1459246302-21837-1-git-send-email-romain.izard.pro@gmail.com> Cc: Thomas Petazzoni , Romain Izard , "Yann E. MORIN" Subject: [Buildroot] [PATCH v2 2/2] 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 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 package/pkg-kconfig.mk | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 94ec3cc..08c3e9f 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -57,11 +57,23 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch fi; \ done +# 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_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ + $$($(2)_KCONFIG_OPTS) oldnoconfig || \ + (yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ + $$($(2)_KCONFIG_OPTS) 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)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ @@ -69,8 +81,7 @@ $$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES) cp $$($(2)_KCONFIG_FILE) $$(@)) $$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \ $$(@) $$($(2)_KCONFIG_FRAGMENT_FILES) - $$(Q)yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) oldconfig + $$(call $(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 @@ -81,8 +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)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) oldconfig + $$(call $(2)_REGEN_DOT_CONFIG) $$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done endef