| Message ID | 20230823115048.823011-4-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/8] kbuild: do not run depmod for 'make modules_sign' | expand |
On Wed, Aug 23, 2023 at 08:50:44PM +0900 Masahiro Yamada wrote: > 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 <masahiroy@kernel.org> > --- > > 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)/ > -- > 2.39.2 Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
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)/
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 <masahiroy@kernel.org> --- Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)