From patchwork Wed Nov 23 15:18:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 25048 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2855501wrr; Wed, 23 Nov 2022 07:25:43 -0800 (PST) X-Google-Smtp-Source: AA0mqf4BPodQQVv+7dcavKccr4DcY1G0miHubv0yjLsRqswnkRM3vppERmyl872X0NuyXL6ngpsd X-Received: by 2002:aa7:d5c5:0:b0:46a:1d7:c94d with SMTP id d5-20020aa7d5c5000000b0046a01d7c94dmr5793422eds.327.1669217143098; Wed, 23 Nov 2022 07:25:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669217143; cv=none; d=google.com; s=arc-20160816; b=qy/gmtbrW+wwpZubdmySI2qtKH8P1rs+DNNbNu9M3T6irqJqayq/jG/zYLUrtQ4yyD jFyLNmQfnx5PdFYKZDoJe7nitztCIKzGXsiQTD3CuFIY8SgfTuC0/9JZfeX23SnTWpPc q6O6EQJR+pfe8rc64j7Uwe2QBXgehUy8+RFLF9RTIKV6OfCJmaWAEaqMW70rrYn68kvO sZ1R0DvlFtTWl+cGLJRJf3GgcwUzMe17HJDVdv6T/hmX5H+qlv0vRNA0rjkk8mMCuTHB YkQN5HSDQKIqHOVEmSuIoYe3mB4XFIdMMXdWcMjW/dejn5YKKJHYCMXbRO6QsVGK2wmy lZEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rs/32uapPu5livhOxx1Zm9JWbwSMSSx8f4Wwu2K94hY=; b=BPjp7hUuwfh4wz3efRirgLzOYTJRoIiBJxuMY4lCY9Rr0GUHZXccnVUaahh8sOHyEz YD1B2O6xWZSImBZZc8ViAB0GbQQ0miMF+bc6WXd75hKaEdFHX3almFlrOPtfxe5yqdMJ 8z3AQdqQxFmeBXMZx2ShW0xVti7pdySzA+jo+adDIMVnzUUH6NRjIr/R7TOUSSF7Fjai oFGqouRchah3csb903Fkrov6ccoNr4k+irzvCkfsY/t2of39fJybdDgrTWmGPtIiCzjE dTKkTV9G7GpkAy3jaTQjAY1Fsh34AOgKh5RjWcDryqZEtj1KU5H4V++NdsTE1IZOKUi7 aacg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZTakJUh4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f26-20020a50fc9a000000b004608b4f28b7si12788468edq.106.2022.11.23.07.25.18; Wed, 23 Nov 2022 07:25:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZTakJUh4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237256AbiKWPTk (ORCPT + 99 others); Wed, 23 Nov 2022 10:19:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238338AbiKWPT3 (ORCPT ); Wed, 23 Nov 2022 10:19:29 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 477502AE08; Wed, 23 Nov 2022 07:19:28 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E772DB820DD; Wed, 23 Nov 2022 15:19:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 469F7C43144; Wed, 23 Nov 2022 15:19:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669216765; bh=OBMm4QqhOlmUT3g2hDP5qvjLfDtxhBIfGMu2b58WDTg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZTakJUh4PdtKZVMtfRk/8rZ7yYVopIAcF1MKUjNpx4uYLT/NqB3Mf1SsYWze85pWo x1E90tv3bomKgNa7eh63QrDSOGbRC7OxoFGAnQ94A76NYCcLAIOSRO1VyC4sVXHJ6m RouFILUtkRGvx58oSm4O3dnFCDSUgN7GQb77ShPvmMADImlEcl//liBhtPSso2Gzgk smA/5LKHQ0uAIWgB4OAKl3D3BNNzAaVt3giuxpqE+2sWxbSGYUUl/3Hy4Px+8zdT5i ZHXqqA2LvfZz+hcHjs+9dN+X/Lhr4jqkIhBersDC9u6NHW0UOD7DaYK0dAHa3zix/s NKvwf9hY/O5Uw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH v2 3/5] kbuild: add read-file macro Date: Thu, 24 Nov 2022 00:18:26 +0900 Message-Id: <20221123151828.509565-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221123151828.509565-1-masahiroy@kernel.org> References: <20221123151828.509565-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750301035227609156?= X-GMAIL-MSGID: =?utf-8?q?1750301035227609156?= Since GMU Make 4.2, $(file ...) supports the read operater '<', which is useful to read a file without forking any process. No warning is shown even if the input file is missing. For older Make versions, it falls back to the cat command. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- (no changes since v1) Makefile | 2 +- scripts/Kbuild.include | 12 ++++++++++++ scripts/Makefile.modfinal | 2 +- scripts/Makefile.modinst | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index eb80332f7b51..60ce9dcafc72 100644 --- a/Makefile +++ b/Makefile @@ -369,7 +369,7 @@ else # !mixed-build include $(srctree)/scripts/Kbuild.include # Read KERNELRELEASE from include/config/kernel.release (if it exists) -KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) +KERNELRELEASE = $(call read-file, include/config/kernel.release) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 9996f34327cb..722846c23264 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -10,6 +10,10 @@ empty := space := $(empty) $(empty) space_escape := _-_SPACE_-_ pound := \# +define newline + + +endef ### # Comparison macros. @@ -55,6 +59,14 @@ stringify = $(squote)$(quote)$1$(quote)$(squote) kbuild-dir = $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) kbuild-file = $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile) +### +# Read a file, replacing newlines with spaces +ifeq ($(call test-ge, $(MAKE_VERSION), 4.2),y) +read-file = $(subst $(newline),$(space),$(file < $1)) +else +read-file = $(shell cat $1 2>/dev/null) +endif + ### # Easy method for doing a status message kecho := : diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index 25bedd83644b..7252f6cf7837 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -13,7 +13,7 @@ include $(srctree)/scripts/Kbuild.include include $(srctree)/scripts/Makefile.lib # find all modules listed in modules.order -modules := $(sort $(shell cat $(MODORDER))) +modules := $(sort $(call read-file, $(MODORDER))) __modfinal: $(modules) @: diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index a4c987c23750..509d424dbbd2 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -9,7 +9,7 @@ __modinst: include include/config/auto.conf include $(srctree)/scripts/Kbuild.include -modules := $(sort $(shell cat $(MODORDER))) +modules := $(sort $(call read-file, $(MODORDER))) ifeq ($(KBUILD_EXTMOD),) dst := $(MODLIB)/kernel