From patchwork Mon May 2 08:36:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Izard X-Patchwork-Id: 617417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3qyyMv2BGZz9t5V for ; Mon, 2 May 2016 18:36:58 +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=TbAtsmVa; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 655EF8808E; Mon, 2 May 2016 08:36:57 +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 VnXFcY9YXnE0; Mon, 2 May 2016 08:36:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 84B3B876C9; Mon, 2 May 2016 08:36:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 30A791BFBF4 for ; Mon, 2 May 2016 08:36:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2B55888248 for ; Mon, 2 May 2016 08:36:55 +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 42CuXxsrwNB5 for ; Mon, 2 May 2016 08:36:54 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 332058822A for ; Mon, 2 May 2016 08:36:54 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id w143so16069034wmw.3 for ; Mon, 02 May 2016 01:36:54 -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; bh=Y6diUV4JF58M0xAivNfnVJRoKB0AWlPndRNPUOxT2g0=; b=TbAtsmVaZ1C4/tup0jZhnPACessldySdrYLTPIbYgqSgDkPvlS+/PPyYRIXc0Sgbu0 PIIPC6XjOjIAPfIPdTjkT/lD0bs6G+MOUXtvnE08Iohp92ZKIKdgkD8SMLSZLRcFp/+3 tQyHKWEm/akkdz7yVqJ33cZRS+gn4C5ONIX643IUAcHdSoGIsMnc5kV3XzES5Sv013R8 2+J9KRrkk8gSlLgJg/cRMLxBCISeSUW4B7ysR19EE5Q6QFfbXZrztlb81Kqrh3jABjvp LRkyMyT/v05oea/WISOvOUOb3d41MgTLx4j131wuMCEvgESrFV7I0X01DKf6DO7Jb/f1 5gdQ== 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; bh=Y6diUV4JF58M0xAivNfnVJRoKB0AWlPndRNPUOxT2g0=; b=Nl/lQWRGK019tgtIe9BarRQhIee8ZIc1S1DG6KqTA3cgfYDg0Kb05nGVCaKa4Xk7/p 9xCjPx5PNszvlGJ/gdPlAg7df56QRIdePaxa7bziPfHS87YgXsY51NGVqK7Em2yhurlQ fpd1stLBKULm56b62f1KcSJ7IZz6KsJMLHFBBVCabBHYnGknpCZTTGqMZtFX2ZIkM9NS 1tFlNlqJMx4CSvAetci/L6iPqz5CzkWdvndXsUwFB6xk9EmbiO48c2QRTCCfk/M4Ww9D gfVX7EqkHP1tVY1GM/mbbmrur9k/BVH97LF3diI0o40nNzKZrQVEaxsFLW/vxHU/m3be N2ew== X-Gm-Message-State: AOPr4FW/tigCmUfy73NoDeY3R55YGLuGIQDTo3CNLj7G5nozewnxsLxJpEjMKAadmPwYbw== X-Received: by 10.28.178.148 with SMTP id b142mr18287289wmf.58.1462178212842; Mon, 02 May 2016 01:36:52 -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 b12sm17574232wmb.0.2016.05.02.01.36.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 May 2016 01:36:51 -0700 (PDT) From: Romain Izard To: buildroot@buildroot.org Date: Mon, 2 May 2016 10:36:39 +0200 Message-Id: <1462178199-21742-1-git-send-email-romain.izard.pro@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Thomas Petazzoni , Romain Izard , "Yann E . MORIN" Subject: [Buildroot] [PATCH v8] core/pkg-kconfig: Use olddefconfig when available 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. Check which targets are supported by the current project, and use the appropriate method to regenerate the .config file. Signed-off-by: Romain Izard Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- 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 v5: Detect available methods and use the most recent one v6: Remove colon from matched rule names v7: Shell-based conditons, does not work with backticks v8: Return to v6, with more comments package/pkg-kconfig.mk | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 4033915..f32a198 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -60,18 +60,44 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch $(2)_KCONFIG_MAKE = \ $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS) +# $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax +# of the shell conflicts with Make's own syntax, this means that backticks +# are used with those shell constructs. Unfortunately, the backtick syntax +# does not nest, and we need to use Make instead of the shell to handle +# conditions. + +# A recursively expanded variable is necessary, to be sure that the shell +# command is called when the rule is processed during the build and not +# when the rule is created when parsing all packages. +$(2)_KCONFIG_RULES = \ + $$(shell $$($(2)_KCONFIG_MAKE) -pn config 2>/dev/null | \ + sed 's/^\([_0-9a-zA-Z]*config\):.*/\1/ p; d') + +# 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 + $$(if $$(filter olddefconfig,$$($(2)_KCONFIG_RULES)), + $$(Q)$$($(2)_KCONFIG_MAKE) olddefconfig, + $$(if $$(filter oldnoconfig,$$($(2)_KCONFIG_RULES)), + $$(Q)$$($(2)_KCONFIG_MAKE) oldnoconfig, + $$(Q)(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 +108,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