From: Brian Gerst <bgerst@didntduck.org>
To: Andrew Morton <akpm@osdl.org>
Cc: lkml <linux-kernel@vger.kernel.org>
Subject: [PATCH] Move modpost files to a new subdir [2/2]
Date: Thu, 22 Jul 2004 08:45:08 -0400 [thread overview]
Message-ID: <40FFB6D4.30908@quark.didntduck.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 65 bytes --]
Fix up path names and Makefiles for modpost.
--
Brian Gerst
[-- Attachment #2: modpost-1b --]
[-- Type: text/plain, Size: 2985 bytes --]
diff -urN linux-mv/scripts/Makefile linux/scripts/Makefile
--- linux-mv/scripts/Makefile 2004-07-18 12:27:55.937519106 -0400
+++ linux/scripts/Makefile 2004-07-18 12:37:24.735893892 -0400
@@ -5,24 +5,11 @@
# docproc: Preprocess .tmpl file in order to generate .sgml docs
# conmakehash: Create arrays for initializing the kernel console tables
-host-progs := conmakehash kallsyms modpost mk_elfconfig pnmtologo bin2c
-always := $(host-progs) empty.o
-
-modpost-objs := modpost.o file2alias.o sumversion.o
+host-progs := conmakehash kallsyms pnmtologo bin2c
+always := $(host-progs)
subdir-$(CONFIG_MODVERSIONS) += genksyms
+subdir-y += modpost
# Let clean descend into subdirs
subdir- += basic lxdialog kconfig package
-
-# 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 -urN linux-mv/scripts/Makefile.modpost linux/scripts/Makefile.modpost
--- linux-mv/scripts/Makefile.modpost 2004-07-18 12:27:55.937519106 -0400
+++ linux/scripts/Makefile.modpost 2004-07-18 12:45:50.139036800 -0400
@@ -50,7 +50,7 @@
# Step 2), invoke modpost
# Includes step 3,4
quiet_cmd_modpost = MODPOST
- cmd_modpost = scripts/modpost \
+ cmd_modpost = scripts/modpost/modpost \
$(if $(KBUILD_EXTMOD),-i,-o) $(symverfile) \
$(filter-out FORCE,$^)
diff -urN linux-mv/scripts/modpost/file2alias.c linux/scripts/modpost/file2alias.c
--- linux-mv/scripts/modpost/file2alias.c 2004-06-23 18:05:42.000000000 -0400
+++ linux/scripts/modpost/file2alias.c 2004-07-19 10:08:54.244446008 -0400
@@ -27,7 +27,7 @@
/* 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 { \
diff -urN linux-mv/scripts/modpost/Makefile linux/scripts/modpost/Makefile
--- linux-mv/scripts/modpost/Makefile 1969-12-31 19:00:00.000000000 -0500
+++ linux/scripts/modpost/Makefile 2004-07-19 10:09:08.304389355 -0400
@@ -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
next reply other threads:[~2004-07-22 12:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-07-22 12:45 Brian Gerst [this message]
2004-07-22 21:10 ` [PATCH] Move modpost files to a new subdir [2/2] sam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=40FFB6D4.30908@quark.didntduck.org \
--to=bgerst@didntduck.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox