From patchwork Mon Jun 26 23:30:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 113156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7834244vqr; Mon, 26 Jun 2023 17:01:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7iwXg8PCaE4FWcLo/sqx6KTj9rCtC5npWRi5RL+6asPqvk6MK8aR0ngGJocEGgs5zw8eZi X-Received: by 2002:a05:6a21:6d88:b0:11d:5b5d:ddf0 with SMTP id wl8-20020a056a216d8800b0011d5b5dddf0mr18876202pzb.49.1687824086146; Mon, 26 Jun 2023 17:01:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687824086; cv=none; d=google.com; s=arc-20160816; b=f71aiIkhdbgoDCUpP8d9OoLIzpXl1p5cCFfnTm52r/3nb3Q9mVZYKqAzhtfWv95VBt aP+yP73B2VNGnjhQOzRg2cZizUHbAUTDvdqVYOaczp+AcUYGL12R8QR8D57DZmUI8oLs noBlj5j+K3QCfYQu1VgIW0oZw7atCs/ykKIdRBSNkltccRlWzeDhcriOG3kM/1gqd1Tg j6uIloFrOhV1lQJDAWiJ0Wokpwo3EWKr7wH1Iip8VfAEs51ftFXwYc6zHbdqEMoL+f+3 qNPBVXKsXNbbS7BCMw6/dsty8YRsVmQ61bQihbSbf5by67lqM4H4EL/Qj2UqyuODUEoo O5uQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=MweGXf9Xzq+x0Clij8AKqvWwHgKlYg2vGlTp22RSz5Q=; fh=wKrPioF+0wPaktGqmf0aQvlk8PY4Pc32rTAsBSAiP8I=; b=rgrXwjGT5qgSnqJ3RnjwTaLJsDvO8NiSHyfgsD7LZ2tt+UXEGQou8eOEg0G/CFD661 0OmdWJM6a6zVYiEl1Bq+8E3mkS3DHKQaUvjdTdgTTk5NcV5xUNnmMDe6V5WB6J8mTPSo 7ews2LlszxOUqSgb+lEAzzzqXGj+LWXONccwROvtdQiD9Rnd7iwqvioo0Y6P/e3vw2fz ttRWVADGgYhi21GPALKIm0w2TsZfO5wJCyH42Nhq5zddw+LrjrRJt9rKTn7nYDQLcd8/ /aRHTXxd+4uRR6NVW6S7/Q95Q9iy1nzxrKB/VVYU1EoVnH5zlQKOTt+FVKAzOkh8O4Bi nXwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TxIfBg0w; 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 p19-20020a170902c71300b001b18c3ee3fasi2544319plp.225.2023.06.26.17.01.13; Mon, 26 Jun 2023 17:01:26 -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=TxIfBg0w; 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 S229828AbjFZXa2 (ORCPT + 99 others); Mon, 26 Jun 2023 19:30:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbjFZXaW (ORCPT ); Mon, 26 Jun 2023 19:30:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 764E9FB; Mon, 26 Jun 2023 16:30:21 -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 0208460F9D; Mon, 26 Jun 2023 23:30:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3914CC433C8; Mon, 26 Jun 2023 23:30:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687822220; bh=cjJsx6TjubpGMxRoEjJsSsu/4pIX4weGQrf/DhGnRwM=; h=From:To:Cc:Subject:Date:From; b=TxIfBg0wkRWHpL0I3cKAWbAYQvCwixUZRiHMJ5JvVbrGo3yea6cFyXZiT3cDkorn6 6Wv/Fbyh3aiTqyAqDJCuJEwUybPSX9E4ryQdrKPyzzcOQCqWT8qr+EgQ7MaNVA9txD vOuS+ZxRar2p91fvXePl+2VVURM+oYIqPIeUhNh5Gu0PsR2x6fqXTzITteMcyH5lmA 0D1W7ZD4PX9MwIk1ojtPGgWd7DnlYPgTkjKeAP3MWrlHuKu0jdHqlRhGzEAUmtW6vm hUA8JcZRhcq1w4evon/LoZN/Nco4NkRqXCo5KnbYBI5IbPkxoXl7C94xaZe4tGtTrZ couq/E4em9y+w== 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 v4 1/3] kbuild: set correct abs_srctree and abs_objtree for package builds Date: Tue, 27 Jun 2023 08:30:12 +0900 Message-Id: <20230626233014.66549-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 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,T_SCC_BODY_TEXT_LINE 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?1769811828957928002?= X-GMAIL-MSGID: =?utf-8?q?1769811828957928002?= When you run 'make rpm-pkg', the rpmbuild tool builds the kernel in rpmbuild/BUILD, but $(abs_srctree) and $(abs_objtree) point to the directory path where make was started, not the kernel is actually being built. The same applies to 'make snap-pkg'. Fix it. Signed-off-by: Masahiro Yamada --- Changes in v4: - Export abs_{src,obj}tree again Changes in v3: - New patch Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f18d59c81241..70b314059d8b 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,10 @@ __all: # descending is started. They are now explicitly listed as the # prepare rule. +this-makefile := $(lastword $(MAKEFILE_LIST)) +export abs_srctree := $(realpath $(dir $(this-makefile))) +export abs_objtree := $(CURDIR) + ifneq ($(sub_make_done),1) # Do not use make's built-in rules and variables @@ -185,8 +189,6 @@ $(if $(abs_objtree),, \ # $(realpath ...) resolves symlinks abs_objtree := $(realpath $(abs_objtree)) -else -abs_objtree := $(CURDIR) endif # ifneq ($(KBUILD_OUTPUT),) ifeq ($(abs_objtree),$(CURDIR)) @@ -196,9 +198,6 @@ else need-sub-make := 1 endif -this-makefile := $(lastword $(MAKEFILE_LIST)) -abs_srctree := $(realpath $(dir $(this-makefile))) - ifneq ($(words $(subst :, ,$(abs_srctree))), 1) $(error source directory cannot contain spaces or colons) endif @@ -211,7 +210,6 @@ need-sub-make := 1 $(this-makefile): ; endif -export abs_srctree abs_objtree export sub_make_done := 1 ifeq ($(need-sub-make),1)