* [PATCH 5.4] kbuild: Fix include path in scripts/Makefile.modpost
@ 2022-08-31 4:17 Nicolas Schier
2022-09-01 10:20 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Schier @ 2022-08-31 4:17 UTC (permalink / raw)
To: stable; +Cc: Jing Leng, Masahiro Yamada, Nicolas Schier
From: Jing Leng <jleng@ambarella.com>
commit 23a0cb8e3225122496bfa79172005c587c2d64bf upstream.
When building an external module, if users don't need to separate the
compilation output and source code, they run the following command:
"make -C $(LINUX_SRC_DIR) M=$(PWD)". At this point, "$(KBUILD_EXTMOD)"
and "$(src)" are the same.
If they need to separate them, they run "make -C $(KERNEL_SRC_DIR)
O=$(KERNEL_OUT_DIR) M=$(OUT_DIR) src=$(PWD)". Before running the
command, they need to copy "Kbuild" or "Makefile" to "$(OUT_DIR)" to
prevent compilation failure.
So the kernel should change the included path to avoid the copy operation.
Signed-off-by: Jing Leng <jleng@ambarella.com>
[masahiro: I do not think "M=$(OUT_DIR) src=$(PWD)" is the official way,
but this patch is a nice clean up anyway.]
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
[nsc: updated context for v5.4]
Signed-off-by: Nicolas Schier <n.schier@avm.de>
---
scripts/Makefile.modpost | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 48585c4d04ad..0273bf7375e2 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -87,8 +87,7 @@ obj := $(KBUILD_EXTMOD)
src := $(obj)
# Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
-include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
- $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
+include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile)
# modpost option for external modules
MODPOST += -e
--
2.37.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 5.4] kbuild: Fix include path in scripts/Makefile.modpost
2022-08-31 4:17 [PATCH 5.4] kbuild: Fix include path in scripts/Makefile.modpost Nicolas Schier
@ 2022-09-01 10:20 ` Greg KH
2022-09-01 10:29 ` Nicolas Schier
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2022-09-01 10:20 UTC (permalink / raw)
To: Nicolas Schier; +Cc: stable, Jing Leng, Masahiro Yamada
On Wed, Aug 31, 2022 at 06:17:24AM +0200, Nicolas Schier wrote:
> From: Jing Leng <jleng@ambarella.com>
>
> commit 23a0cb8e3225122496bfa79172005c587c2d64bf upstream.
>
> When building an external module, if users don't need to separate the
> compilation output and source code, they run the following command:
> "make -C $(LINUX_SRC_DIR) M=$(PWD)". At this point, "$(KBUILD_EXTMOD)"
> and "$(src)" are the same.
>
> If they need to separate them, they run "make -C $(KERNEL_SRC_DIR)
> O=$(KERNEL_OUT_DIR) M=$(OUT_DIR) src=$(PWD)". Before running the
> command, they need to copy "Kbuild" or "Makefile" to "$(OUT_DIR)" to
> prevent compilation failure.
>
> So the kernel should change the included path to avoid the copy operation.
>
> Signed-off-by: Jing Leng <jleng@ambarella.com>
> [masahiro: I do not think "M=$(OUT_DIR) src=$(PWD)" is the official way,
> but this patch is a nice clean up anyway.]
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> [nsc: updated context for v5.4]
> Signed-off-by: Nicolas Schier <n.schier@avm.de>
> ---
> scripts/Makefile.modpost | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
> index 48585c4d04ad..0273bf7375e2 100644
> --- a/scripts/Makefile.modpost
> +++ b/scripts/Makefile.modpost
> @@ -87,8 +87,7 @@ obj := $(KBUILD_EXTMOD)
> src := $(obj)
>
> # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
> -include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
> - $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
> +include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile)
>
> # modpost option for external modules
> MODPOST += -e
> --
> 2.37.2
>
Does not apply to the 5.4.y tree at all, are you sure you generated this
properly?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 5.4] kbuild: Fix include path in scripts/Makefile.modpost
2022-09-01 10:20 ` Greg KH
@ 2022-09-01 10:29 ` Nicolas Schier
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Schier @ 2022-09-01 10:29 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Jing Leng, Masahiro Yamada
On Thu, Sep 01, 2022 at 12:20:57PM +0200, Greg KH wrote:
> On Wed, Aug 31, 2022 at 06:17:24AM +0200, Nicolas Schier wrote:
> > From: Jing Leng <jleng@ambarella.com>
> >
> > commit 23a0cb8e3225122496bfa79172005c587c2d64bf upstream.
> >
> > When building an external module, if users don't need to separate the
> > compilation output and source code, they run the following command:
> > "make -C $(LINUX_SRC_DIR) M=$(PWD)". At this point, "$(KBUILD_EXTMOD)"
> > and "$(src)" are the same.
> >
> > If they need to separate them, they run "make -C $(KERNEL_SRC_DIR)
> > O=$(KERNEL_OUT_DIR) M=$(OUT_DIR) src=$(PWD)". Before running the
> > command, they need to copy "Kbuild" or "Makefile" to "$(OUT_DIR)" to
> > prevent compilation failure.
> >
> > So the kernel should change the included path to avoid the copy operation.
> >
> > Signed-off-by: Jing Leng <jleng@ambarella.com>
> > [masahiro: I do not think "M=$(OUT_DIR) src=$(PWD)" is the official way,
> > but this patch is a nice clean up anyway.]
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > [nsc: updated context for v5.4]
> > Signed-off-by: Nicolas Schier <n.schier@avm.de>
> > ---
> > scripts/Makefile.modpost | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
> > index 48585c4d04ad..0273bf7375e2 100644
> > --- a/scripts/Makefile.modpost
> > +++ b/scripts/Makefile.modpost
> > @@ -87,8 +87,7 @@ obj := $(KBUILD_EXTMOD)
> > src := $(obj)
> >
> > # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
> > -include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
> > - $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
> > +include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile)
> >
> > # modpost option for external modules
> > MODPOST += -e
> > --
> > 2.37.2
> >
>
> Does not apply to the 5.4.y tree at all, are you sure you generated this
> properly?
oh, I mixed up something locally. Thanks for taking the v4.9 version of
it.
Kind regards,
Nicolas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-01 10:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-31 4:17 [PATCH 5.4] kbuild: Fix include path in scripts/Makefile.modpost Nicolas Schier
2022-09-01 10:20 ` Greg KH
2022-09-01 10:29 ` Nicolas Schier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox