From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FFF4C3F2C6 for ; Tue, 3 Mar 2020 18:06:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB1A5214D8 for ; Tue, 3 Mar 2020 18:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258801; bh=L0CY501USvhcsiuO9rnQOSZEAjIyjx5IZH1J/ItUlgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uJ7eRCQxvyvnZ6SJkbwDl0ijt1x314WLGx7cvrZaQtRyshRA/xDsZHNMH8be9C42H z5gfm5W8YcieeUfDZ9L3g45v6HZYlUF3W3sc6XVykXIARrzAhSabUsAwGu4asqOHkn aZCEJZADmGvEXex8AWmPLhnrddpz/E9Iml4Y1HA0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388301AbgCCSGj (ORCPT ); Tue, 3 Mar 2020 13:06:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:38338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732568AbgCCR4R (ORCPT ); Tue, 3 Mar 2020 12:56:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 415B4206D5; Tue, 3 Mar 2020 17:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258176; bh=L0CY501USvhcsiuO9rnQOSZEAjIyjx5IZH1J/ItUlgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lCtyk+A3UvZpKsJs7iqOCK7UEzi+XUwuUqtGpv37liEed82dyKqq/nYXBPJwFahWF /QmLzJtOFKYTC7BihONWXGLNDSvIDHoERC3LDML9c9lSPDb9bks2DNKPRu9U9ZAB95 eihBx86Io0x0hy1X/nu8xZzpZO5bfFrlwPzqstuM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Rob Herring Subject: [PATCH 5.4 101/152] kbuild: fix DT binding schema rule to detect command line changes Date: Tue, 3 Mar 2020 18:43:19 +0100 Message-Id: <20200303174314.062989519@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174302.523080016@linuxfoundation.org> References: <20200303174302.523080016@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada commit 7a04960560640ac5b0b89461f7757322b57d0c7a upstream. This if_change_rule is not working properly; it cannot detect any command line change. The reason is because cmd-check in scripts/Kbuild.include compares $(cmd_$@) and $(cmd_$1), but cmd_dtc_dt_yaml does not exist here. For if_change_rule to work properly, the stem part of cmd_* and rule_* must match. Because this cmd_and_fixdep invokes cmd_dtc, this rule must be named rule_dtc. Fixes: 4f0e3a57d6eb ("kbuild: Add support for DT binding schema checks") Signed-off-by: Masahiro Yamada Acked-by: Rob Herring Signed-off-by: Greg Kroah-Hartman --- scripts/Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -305,13 +305,13 @@ DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING quiet_cmd_dtb_check = CHECK $@ cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ ; -define rule_dtc_dt_yaml +define rule_dtc $(call cmd_and_fixdep,dtc,yaml) $(call cmd,dtb_check) endef $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE - $(call if_changed_rule,dtc_dt_yaml) + $(call if_changed_rule,dtc) dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)