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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 ACCE2C3F2D1 for ; Thu, 5 Mar 2020 17:19:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C92B20848 for ; Thu, 5 Mar 2020 17:19:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428770; bh=QTPrZ8L1wMcEl85u1Lgl6O7EWS4Lod16z+aVQ0DhUrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TKsIlxxRFNgEg/eqtF8XalkYxCNeAbe7bzMEOFHI8dZKmxzxEfyA2ikL1sMhSLb3T T08HYo3JZoo2+u2HS5jyJaC9TNdxHFo2/Lri50V4Q+n8NaBCCgzos3/lAx3/W6tbZs 06AuNoXB1cw4+1GOaHRcMqfO+vsjWTNker4IArDI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727828AbgCERTY (ORCPT ); Thu, 5 Mar 2020 12:19:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:41708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727956AbgCERPH (ORCPT ); Thu, 5 Mar 2020 12:15:07 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B71BE2146E; Thu, 5 Mar 2020 17:15:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428507; bh=QTPrZ8L1wMcEl85u1Lgl6O7EWS4Lod16z+aVQ0DhUrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=voxxUxfkEAyDeRi6TmOA7XWHuCBCf3LAErPk1X9lv6OYHYNcdu1l1Vmu4Zr2epWRr QVTHwvEM7Nm/PcV6TJYq5CHGSy+QWX3ye5+My6N42XVNhT3itWHwWEe9+JvLLprs3e uEcETw3sbRvBKP+wFZzcZ4CaiF3jgKf6wFRxJ6Kk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Masahiro Yamada , Rob Herring , Sasha Levin , linux-kbuild@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 37/58] kbuild: fix DT binding schema rule to detect command line changes Date: Thu, 5 Mar 2020 12:13:58 -0500 Message-Id: <20200305171420.29595-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200305171420.29595-1-sashal@kernel.org> References: <20200305171420.29595-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 [ Upstream commit 7a04960560640ac5b0b89461f7757322b57d0c7a ] 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: Sasha Levin --- scripts/Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 179d55af58529..8a6663580b8e1 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -305,13 +305,13 @@ DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml 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) -- 2.20.1