kbuild: Fix up moving of modpost

A few small issues to fix the moving of modpost.
A few files was missing in the commit and one change needed.
Also bk ignored the files in their new location.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/scripts/Makefile b/scripts/Makefile
index 9c38cee3c8b35ea3a3f04a94c2c6eb8a0a1e3f0c..81c913c1ee3f92611523b88787bc2be02802f1fd 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -9,7 +9,7 @@ host-progs      := conmakehash kallsyms pnmtologo bin2c
 always         := $(host-progs)
 
 subdir-$(CONFIG_MODVERSIONS)   += genksyms
-subdir-y       += modpost
+subdir-y       += mod
 
 # Let clean descend into subdirs
 subdir-        += basic lxdialog kconfig package

diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
new file mode 100644 (file)
index 0000000..f66bf52
--- /dev/null
+++ b/scripts/mod/Makefile
@@ -0,0 +1,16 @@
+host-progs     := modpost mk_elfconfig
+always         := $(host-progs) empty.o
+
+modpost-objs   := modpost.o file2alias.o sumversion.o
+
+# dependencies on generated files need to be listed explicitly
+
+$(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h
+
+quiet_cmd_elfconfig = MKELF   $@
+      cmd_elfconfig = $(obj)/mk_elfconfig $(ARCH) < $< > $@
+
+$(obj)/elfconfig.h: $(obj)/empty.o $(obj)/mk_elfconfig FORCE
+       $(call if_changed,elfconfig)
+
+targets += elfconfig.h

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index fa8fd160b2b86a0da6f71fe217af248c74b301f9..f38c6d7def2a338a2c133f59e8d700285e07b8a3 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -27,7 +27,7 @@ typedef unsigned char  __u8;
 /* Big exception to the "don't include kernel headers into userspace, which
  * even potentially has different endianness and word sizes, since 
  * we handle those differences explicitly below */
-#include "../include/linux/mod_devicetable.h"
+#include "../../include/linux/mod_devicetable.h"
 
 #define ADD(str, sep, cond, field)                              \
 do {                                                            \