diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2024-03-06 19:42:22 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2024-03-10 17:27:17 +0900 |
| commit | e2bad142bb3de836c5fbb3dff704578f5a73d8e6 (patch) | |
| tree | 11acf98cd7d546f46ccfd22cb33a96713f5456b8 /scripts | |
| parent | 75b5ab134bb5f657ef7979a59106dce0657e8d87 (diff) | |
| download | linux-e2bad142bb3de836c5fbb3dff704578f5a73d8e6.tar.gz linux-e2bad142bb3de836c5fbb3dff704578f5a73d8e6.tar.bz2 linux-e2bad142bb3de836c5fbb3dff704578f5a73d8e6.zip | |
kbuild: unexport abs_srctree and abs_objtree
Commit 25b146c5b8ce ("kbuild: allow Kbuild to start from any directory")
exported abs_srctree and abs_objtree to avoid recomputation after the
sub-make. However, this approach turned out to be fragile.
Commit 5fa94ceb793e ("kbuild: set correct abs_srctree and abs_objtree
for package builds") moved them above "ifneq ($(sub_make_done),1)",
eliminating the need for exporting them.
These are only needed in the top Makefile. If an absolute path is
required in sub-directories, you can use $(abspath ) or $(realpath )
as needed.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.package | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.package b/scripts/Makefile.package index a81dfb1f5181..38653f3e8108 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -135,7 +135,7 @@ snap-pkg: mkdir $(objtree)/snap $(MAKE) clean sed "s@KERNELRELEASE@$(KERNELRELEASE)@; \ - s@SRCTREE@$(abs_srctree)@" \ + s@SRCTREE@$(realpath $(srctree))@" \ $(srctree)/scripts/package/snapcraft.template > \ $(objtree)/snap/snapcraft.yaml cd $(objtree)/snap && \ |