kbuild: get rid of kernel/ prefix from in-tree modules.{order,builtin}

Removing the 'kernel/' prefix will make our life easier because we can
simply do 'cat modules.order' to get all built modules with full paths.

Currently, we parse the first line of '*.mod' files in $(MODVERDIR).
Since we have duplicated functionality here, I plan to remove MODVERDIR
entirely.

In fact, modules.order is generated also for external modules in a
broken format. It adds the 'kernel/' prefix to the absolute path of
the module, like this:

  kernel//path/to/your/external/module/foo.ko

This is fine for now since modules.order is not used for external
modules. However, I want to sanitize the format everywhere towards
the goal of removing MODVERDIR.

We cannot change the format of installed module.{order,builtin}.
So, 'make modules_install' will add the 'kernel/' prefix while copying
them to $(MODLIB)/.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/Makefile b/Makefile
index b74a6e9cefc8fad86ccbaf0b5055654089c5dc7a..396cd5e525d1bcbe137771795a7d522e87b1c079 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1329,8 +1329,8 @@ _modinst_:
                rm -f $(MODLIB)/build ; \
                ln -s $(CURDIR) $(MODLIB)/build ; \
        fi
-       @cp -f $(objtree)/modules.order $(MODLIB)/
-       @cp -f $(objtree)/modules.builtin $(MODLIB)/
+       @sed 's:^:kernel/:' modules.order > $(MODLIB)/modules.order
+       @sed 's:^:kernel/:' modules.builtin > $(MODLIB)/modules.builtin
        @cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
 

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 631bb89524de584a2afbffcc85a60da48c5da249..10e92a27ec20635465e6bdc9e2ed68e897625ab4 100644 (file)
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -426,7 +426,7 @@ endif # builtin-target
 modorder-cmds =                                                \
        $(foreach m, $(modorder),                       \
                $(if $(filter %/modules.order, $m),     \
-                       cat $m;, echo kernel/$m;))
+                       cat $m;, echo $m;))
 
 $(modorder-target): $(subdir-ym) FORCE
        $(Q)(cat /dev/null; $(modorder-cmds)) > $@

diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
index 50a9990760f30ad14b3817a4d48ac72353ad9b62..7d4711b886568c61b860718abfd22789ee505dc2 100644 (file)
--- a/scripts/Makefile.modbuiltin
+++ b/scripts/Makefile.modbuiltin
@@ -40,7 +40,7 @@ __modbuiltin: $(modbuiltin-target) $(subdir-ym)
        @:
 
 $(modbuiltin-target): $(subdir-ym) FORCE
-       $(Q)(for m in $(modbuiltin-mods); do echo kernel/$$m; done;     \
+       $(Q)(for m in $(modbuiltin-mods); do echo $$m; done;    \
        cat /dev/null $(modbuiltin-subdirs)) > $@
 
 PHONY += FORCE

diff --git a/scripts/modules-check.sh b/scripts/modules-check.sh
index 39e8cb36ba19c4a919eff479f86b18ca44a16053..f51f446707b82de9462d4a1c47949ecd5468a7d9 100755 (executable)
--- a/scripts/modules-check.sh
+++ b/scripts/modules-check.sh
@@ -9,7 +9,7 @@ check_same_name_modules()
        for m in $(sed 's:.*/::' modules.order | sort | uniq -d)
        do
                echo "warning: same module names found:" >&2
-               sed -n "/\/$m/s:^kernel/:  :p" modules.order >&2
+               sed -n "/\/$m/s:^:  :p" modules.order >&2
        done
 }