From patchwork Wed Aug 23 11:50:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp502128vqm; Wed, 23 Aug 2023 07:34:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaHY6hdw7SleKRD+inAm6UJoXGLApps/d3zHfxtb86+oBVTnbZ+TfEYtlSJJRdtYQYOUJw X-Received: by 2002:a05:6402:34b:b0:523:493e:929c with SMTP id r11-20020a056402034b00b00523493e929cmr9359192edw.10.1692801259976; Wed, 23 Aug 2023 07:34:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692801259; cv=none; d=google.com; s=arc-20160816; b=bD4tyFi+6dbJg2GJGPqFjG9s83PtOa1D3xmr/nXJXusFH0HnZO9F1az3mxbGpfXSby DTLjIQ4PlcJTGtG8TqDwcVVFPwpFnm3UdwvneDGEOYdpweWYcUNjGEBZLI7JlfZ6IH1X qXe/DFjV0jTdl9uydCbpDM/Jx8wv94oDp+BgDbM4ZanZGkkgHeWc2nRG8R+Lvl6IB40Q auOrYrdhariSJRMSvU40jT36coLSXrTnZjvi2Mg8GHK+koEID/waeBQXUslQxcmOACQn DCRoX+Uhp/0jqwJd+aiuphq6flDHe8EBVGal/dlwBbEfUISwNTOgDDf3BcD7Sh9fWTwE XEjA== 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=P5HqnkzgusAxnu/f8Lf371+SnHDems2lTdqrAadjJyY=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=KQrAmS436A8lKFcXxSnaSllffUIMftBjFv2VCGjjBby4jeowzWzAEjCC85N0cPWDWy kxsO371HsyDod6tKStYVDkqDxFLiU5OVTWRZtuQggU7tpPr0oSELdnseh0tMZq9lhgo5 rAkN/n1NrutxHU1wWPAgpo7xfrU7gyNzZ65iJuHTLoSvauosTx2zZ5Rturiy6hWSaRen hIqOXS/VFnVQgsrP/gp8GUWyoIuSu5L05lLYYiAPvHiA05BnnrSHj24eiuKhzzK2IXtc Ka0lDXTdgdykyE8ce1DtISVMEq256H6xD0t7creUKqPEVqZ3SIZM0M7oDs/ZhLK6nBhy zgfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=m+dzP8W5; 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 h18-20020a50ed92000000b00523c5ff72a6si9307822edr.70.2023.08.23.07.33.56; Wed, 23 Aug 2023 07:34:19 -0700 (PDT) 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=m+dzP8W5; 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 S234543AbjHWLvD (ORCPT + 99 others); Wed, 23 Aug 2023 07:51:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234538AbjHWLvC (ORCPT ); Wed, 23 Aug 2023 07:51:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A8FFDB; Wed, 23 Aug 2023 04:51:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3542B64A6D; Wed, 23 Aug 2023 11:51:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 081F0C433C7; Wed, 23 Aug 2023 11:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791459; bh=at6MwZstCK4YYvJ/JENZT9OnY5U7qwdQvQ8iXxtDGtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m+dzP8W5sVJegKiGHku5Bp2hI0RCOwciogN11sjhg9SBjngWylSnHg2IPA4SE93wP sQN7AutlFsQwCVEB5jLiUdwtXrymkAX7f9OHl8Jb6rQbiW8YEFSrEq1VhFKdJLoE/d lORgMFqHAmFe9z3w/6D5vX79QA8iBjVLl4vnmBYLtMkLYDLafhjvuhI8QQIXwNActw GNFD/UZ5LbWHlIbsHHetdLrU1I7TC8aH+gqVH56g+Ajn54BtFxTdJ5zN8DEQ5mHyIH HvQ7TP8SacJOB2Om8IJVKLCm6IiEm/3JNFWPTo969bk349/mwDHiIC2Yv0IVBPRqMU XKZkGal/chvJg== 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 3/8] kbuild: move depmod rule to scripts/Makefile.modinst Date: Wed, 23 Aug 2023 20:50:43 +0900 Message-Id: <20230823115048.823011-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823115048.823011-1-masahiroy@kernel.org> References: <20230823115048.823011-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1775030773972343940 X-GMAIL-MSGID: 1775030773972343940 depmod is a part of the module installation. scripts/Makefile.modinst is a better place to run it. Signed-off-by: Masahiro Yamada --- Makefile | 8 -------- scripts/Makefile.modinst | 9 +++++++++ scripts/depmod.sh | 10 ++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index e2dfa3b994f7..c9c8019e4720 100644 --- a/Makefile +++ b/Makefile @@ -509,7 +509,6 @@ LEX = flex YACC = bison AWK = awk INSTALLKERNEL := installkernel -DEPMOD = depmod PERL = perl PYTHON3 = python3 CHECK = sparse @@ -1871,15 +1870,8 @@ PHONY += modules_check modules_check: $(MODORDER) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh $< -quiet_cmd_depmod = DEPMOD $(MODLIB) - cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \ - $(KERNELRELEASE) - modules_install: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst -ifndef modules_sign_only - $(call cmd,depmod) -endif else # CONFIG_MODULES diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index ab0c5bd1a60f..7a64ece9b826 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -86,6 +86,15 @@ $(dst)/%.ko: $(extmod_prefix)%.ko FORCE $(call cmd,strip) $(call cmd,sign) +__modinst: depmod + +PHONY += depmod +depmod: $(modules) + $(call cmd,depmod) + +quiet_cmd_depmod = DEPMOD $(MODLIB) + cmd_depmod = $(srctree)/scripts/depmod.sh $(KERNELRELEASE) + else $(dst)/%.ko: FORCE diff --git a/scripts/depmod.sh b/scripts/depmod.sh index fca689ba4f21..ee771ccb1f9c 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -3,12 +3,14 @@ # # A depmod wrapper used by the toplevel Makefile -if test $# -ne 2; then - echo "Usage: $0 /sbin/depmod " >&2 +if test $# -ne 1; then + echo "Usage: $0 " >&2 exit 1 fi -DEPMOD=$1 -KERNELRELEASE=$2 + +KERNELRELEASE=$1 + +: ${DEPMOD:=depmod} if ! test -r System.map ; then echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2