From patchwork Tue Feb 19 09:33:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 158709 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3451219jaa; Tue, 19 Feb 2019 01:33:48 -0800 (PST) X-Google-Smtp-Source: AHgI3IY9LQHLk2mU5UUy0sfeU7eQEjnbIlN+FpfBBUEH1LF+qu6tfg0IbS9kyM8EpXST0zOaWEJA X-Received: by 2002:a62:5c4:: with SMTP id 187mr14854235pff.153.1550568828794; Tue, 19 Feb 2019 01:33:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550568828; cv=none; d=google.com; s=arc-20160816; b=dO9C7z/BlFrxf80aLMgMnhwvvz+qVzT6fYArbOKz2aIhKTCnNuSPLwpJP8PZrTbviw O+JrAuYjBuQe7K2P0K2YyzeofJ5Rwzp8dznOmRThQ37cyBiCkRktKi7vgZyEW9ZSL+49 4HNG+8F/tewEijY8GPDl6qM2WrfwzbB7yIZvVFkIg7HpgK9PIeuZWj7Ndd+TS8c5s+DG Bxzfecz9jDgSsTwpA8kM9OBjat8rDIhCQQCEo4/MxGv3bjr/ZcbwEvmTAmGjT50p8nRm STXIvNGiHJTOoj5Wq4JlouhzQXJoFOZu3gKCxLp3pHanNJiMwYHaeDKx1W0ydi4AZ/Kz /UzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=LpVzcmMvxAwWbg6InvMN4itJqp0PH2zyJ5T3ksV7i4k=; b=RFRCwLz19L22H1DKM3eMWdNACVfqeOBzv8kvzHdkOsJEBrtm1qOXnf8YjDljyociaR JgonT8gAnIs+CwbBWyFobiP5saU+gY+7eF6z/RRKqzXL+n5iZjqbYKUFRBn1wABYyWG5 XI7xOsqjBsGRNCGDe2Fp9mFXjkpTGq8QbzRLjUKyuiYZCo+OJ39u+1f6DGQ3PzSCqDYU lp1pBHowu05FyqZc3vLI/5glfP5tFtn+xfw+AB4AWNklHEEK7FHDjI//kM6acleiuFGD MmEaR5glcNglk2XH7eYWTx/pw4igLPzA07XYD2UiaYw0nBanGcWgx/QsaLCGHaqc8j0d UL8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tcmWlt0Y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r12si15842287plo.59.2019.02.19.01.33.48; Tue, 19 Feb 2019 01:33:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=tcmWlt0Y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728320AbfBSJdq (ORCPT + 32 others); Tue, 19 Feb 2019 04:33:46 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:53209 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726969AbfBSJdo (ORCPT ); Tue, 19 Feb 2019 04:33:44 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x1J9XBkM002572; Tue, 19 Feb 2019 18:33:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x1J9XBkM002572 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1550568792; bh=LpVzcmMvxAwWbg6InvMN4itJqp0PH2zyJ5T3ksV7i4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tcmWlt0YrbAbfQcvzqsVEym5Ev6XG7pQYx+bxUitf2wUusx3Koem9zJVWSybCa68k 5qRJhxnDq9KJd4k17ANUWC64q1kNPGE/+rRSEah+jVPexeFlO9Zd+j16z/botu1L++ xAYI2s7vJZLg87W3eJywNrLvJstlRn2RXgwiltTtbBXsXUhr20vRUUDGuD+XYqEHPP r+S4xsWLb1cxdzEX0UeTOZR8PzWCN5HP8X5viBZt3A125IvuQH+8wsF9o0iw03qi5B 8vuSgfw4QM3NOj2uzcexOl2Cl2Lge6kvDC1ebFZmiyjfHRM3wnWq+cWrkp2rF22lv0 XDoJkg1HaHoQg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Kieran Bingham , Masahiro Yamada , linux-kernel@vger.kernel.org, Michal Marek , Jan Kiszka Subject: [PATCH 3/5] scripts/gdb: do not descend into scripts/gdb from scripts Date: Tue, 19 Feb 2019 18:33:04 +0900 Message-Id: <1550568787-18710-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> References: <1550568787-18710-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, Kbuild descends from scripts/Makefile to scripts/gdb/Makefile just for creating symbolic links, but it does not need to do it so early. Merge the two descending paths to simplify the code. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- scripts/Makefile | 3 +-- scripts/gdb/linux/Makefile | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) -- 2.7.4 Reviewed-by: Kieran Bingham diff --git a/Makefile b/Makefile index 26dbcb7..a5762c6 100644 --- a/Makefile +++ b/Makefile @@ -1518,7 +1518,7 @@ $(DOC_TARGETS): scripts_basic FORCE PHONY += scripts_gdb scripts_gdb: prepare - $(Q)$(MAKE) $(build)=scripts/gdb/linux build_constants_py + $(Q)$(MAKE) $(build)=scripts/gdb ifdef CONFIG_GDB_SCRIPTS all: scripts_gdb diff --git a/scripts/Makefile b/scripts/Makefile index feb1f71..9d442ee 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -39,7 +39,6 @@ build_unifdef: $(obj)/unifdef subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-$(CONFIG_SECURITY_SELINUX) += selinux -subdir-$(CONFIG_GDB_SCRIPTS) += gdb # Let clean descend into subdirs -subdir- += basic dtc kconfig mod package +subdir- += basic dtc gdb kconfig mod package diff --git a/scripts/gdb/linux/Makefile b/scripts/gdb/linux/Makefile index aba23be..7545806 100644 --- a/scripts/gdb/linux/Makefile +++ b/scripts/gdb/linux/Makefile @@ -14,11 +14,8 @@ quiet_cmd_gen_constants_py = GEN $@ $(CPP) -E -x c -P $(c_flags) $< > $@ ;\ sed -i '1,//d;' $@ -targets += constants.py -$(obj)/constants.py: $(SRCTREE)/$(obj)/constants.py.in FORCE +extra-y += constants.py +$(obj)/constants.py: $(src)/constants.py.in FORCE $(call if_changed_dep,gen_constants_py) -build_constants_py: $(obj)/constants.py - @: - -clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py) $(obj)/constants.py +clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py)