From patchwork Tue Mar 3 17:43:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 229886 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=unavailable 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 72CC2C3F2C6 for ; Tue, 3 Mar 2020 18:11:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D6D42166E for ; Tue, 3 Mar 2020 18:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583259113; bh=rqivXkV16iF43yCkpdhW87I7b55J5RVrhFZwHWy1Fyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hAwk6fuv4v8RoG2XSFNIZ8d0aEOPopvekoMdTiewCICWByCWgAjaCsMTlCeKWwL5z r77DWsksASLWJT0ehb/yrQZ8Zf7nIgJgXktgNpG5+UdLjl9LeHO7Wxu6kiXPNmZUJo Wax6Gmcr7lvRv2SafrhESq04++NOQGBEEj5vRnqk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732233AbgCCSLs (ORCPT ); Tue, 3 Mar 2020 13:11:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:56720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729625AbgCCRt1 (ORCPT ); Tue, 3 Mar 2020 12:49:27 -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 7B2E320870; Tue, 3 Mar 2020 17:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257765; bh=rqivXkV16iF43yCkpdhW87I7b55J5RVrhFZwHWy1Fyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vr7FAr7yjp7v6uyVqsq7oLWiSvf4eqxa9UDjn/ie2UPt2u7unuvQNsWbl9ISU0lqB rUx+zvcemIipQcP5IMk5ESsqEu9aKKUScV5iRln1CqGPErFIixAHQqzfbgTcQFsF3B A4I5tRyrVpYuXWHBYyNkuFz+0bI4fGwV+OTrF3HI= 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.5 120/176] kbuild: fix DT binding schema rule to detect command line changes Date: Tue, 3 Mar 2020 18:43:04 +0100 Message-Id: <20200303174318.683392252@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -291,13 +291,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)