From patchwork Wed Aug 23 11:50:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp465424vqm; Wed, 23 Aug 2023 06:37:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGABSn7euKHpEKDAzqz3YEwf5Y2NxqEJMS4vXwiIT/Bd5Cr+2hBSnVJfw9tqw7TAERbISnP X-Received: by 2002:a05:6808:8a:b0:3a7:458e:3df4 with SMTP id s10-20020a056808008a00b003a7458e3df4mr12706607oic.56.1692797854462; Wed, 23 Aug 2023 06:37:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692797854; cv=none; d=google.com; s=arc-20160816; b=irXzZsI/Yh9aBn6wgl+NLjYxZtkUKbOnFrMM/5w6S6VhtQjArKrQRYcUlMDA0ZWz+P C9FXPi2bbgHZcY2uwsow4wXQIVrpQQrQcAGlX+BmiVfI2hG9nqosYdm/p2+lFMo1ZCkb z/BnmBkb1h/luffxpsjXlJhyBGT2zElIXMJPvob4kGIHsGXyvHnxKuARSVa9mTlsQhTI g03bkp9onSSe4a7HwiKkTB/aBc8ELueiPwB/XiLZ/uJbJ6FABdKNgpPg6SCch3k0mfra OsA8KFyH+7MLKjTFywiaZERjJY2U3SIDnhGNRAcRavNsU0EhhSNXai5B/pV/HWqzl88d W93w== 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=E5n69GIZZp+9DMU5aIKvfPHx3HlDNk4Ho6jL5Y5JkfA=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=B3gEeWuJPm9OJnDTFS0yY3n9W4scEMnVjBHpS8ksLtXaCWMLSVjEsPcpylBUrXgR4+ W1WlOHYKua9dWfx7GT7V/VPwUrqstlh9gUHA8ToA9YxmGmogvpMJy/umFK+WFvhP3Pj4 CRJYg4sTap0RErYLbzPqkKM71CE5NgfR4+ukdjkopdcYL1FSWpw324Un4wpbxe7defL4 5MMtvfnrUb6IRzrn0d20W98H3cso6pejNzUssQb//597xG9KXVLX942J0GhafxY5giv1 FeHu3B7yoaBwmxtK1p98sXiOB7V6ECU7EDalWyzmI8ps9DDAl243v+GwjWmhjiazAGke AFHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eUxX4xhs; 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 x185-20020a6386c2000000b005697ebac19esi8152179pgd.776.2023.08.23.06.37.19; Wed, 23 Aug 2023 06:37:34 -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=eUxX4xhs; 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 S234336AbjHWLvF (ORCPT + 99 others); Wed, 23 Aug 2023 07:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234545AbjHWLvE (ORCPT ); Wed, 23 Aug 2023 07:51:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE285DB; Wed, 23 Aug 2023 04:51:02 -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 3B73964B5F; Wed, 23 Aug 2023 11:51:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFE55C433BB; Wed, 23 Aug 2023 11:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791461; bh=17ZI9OuOHnRLfA+Aw4o40RdR2fIS9vJw5OhR2qQpZiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eUxX4xhsUQgev7TX7KnUzypflQUoGPIqH8x29uyoEn26LluX/etqEJ1udaR/94PEz GRJiMpf1EMIA9nJAp64bvT3EdAn+HalMD8WVX6ed7DwYReKntOvr0zF5c+VeB45iYp yqqux7rPhmld+o67J4rmILzy8FflfnQ4JRWe/CPYcsxDS9+LFlKN6p6dEQ13GzQDrx SCqzA7gT/mo0ujZGj3kVfM0/VTUj8K+3uzVkZGHSDCmq3uLor8uV1N8xfV5IyeRjFX Wd+PweV490O6s4pKn5yZ3XDD5DFXE5E3lqHNm4gzgg9sGAQD+SD+SC3oPknXYVovAV m2/bbSFidLEgQ== 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 4/8] kbuild: remove $(MODLIB)/source symlink Date: Wed, 23 Aug 2023 20:50:44 +0900 Message-Id: <20230823115048.823011-4-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=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: INBOX X-GMAIL-THRID: 1775027202801169691 X-GMAIL-MSGID: 1775027202801169691 This reverts the old commit "kbuild: Introduce source symlink in /lib/modules/.../". [1] The current Kbuild does not require $(MODLIB)/source. If the kernel was built in a separate output directory, $(MODLIB)/build/Makefile wraps the Makefile in the source tree. It is enough for building external modules. [1] https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=e09e58867154b8aae0a3ac26a9b1c05962f5a355 Signed-off-by: Masahiro Yamada --- Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c9c8019e4720..7d9cab3d2186 100644 --- a/Makefile +++ b/Makefile @@ -1486,14 +1486,10 @@ modules_install: $(modinst_pre) PHONY += __modinst_pre __modinst_pre: @rm -rf $(MODLIB)/kernel - @rm -f $(MODLIB)/source + @rm -f $(MODLIB)/build @mkdir -p $(MODLIB) ifdef CONFIG_MODULES - @ln -s $(abspath $(srctree)) $(MODLIB)/source - @if [ ! $(objtree) -ef $(MODLIB)/build ]; then \ - rm -f $(MODLIB)/build ; \ - ln -s $(CURDIR) $(MODLIB)/build ; \ - fi + @ln -s $(CURDIR) $(MODLIB)/build @sed 's:^\(.*\)\.o$$:kernel/\1.ko:' modules.order > $(MODLIB)/modules.order endif @cp -f modules.builtin $(MODLIB)/