* [GIT PATCH] kbuild fixes
@ 2006-01-16 11:56 Sam Ravnborg
0 siblings, 0 replies; 2+ messages in thread
From: Sam Ravnborg @ 2006-01-16 11:56 UTC (permalink / raw)
To: Linus Torvalds, linux-kernel, Andrew Morton; +Cc: Roman Zippel
Hi Linus.
Please pull latest kbuild fixes from:
ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git
Soon to be mirrored out at:
git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git
It contains four bugfixes to kbuild/kconfig:
Sam Ravnborg:
kconfig: get rid of stray a.o, support ncursesw
kbuild: fix make -jN with multiple targets with O=...
kbuild: create .kernelrelease at *config step
kbuild: fix 'make all install_modules install'
The commit named "kconfig: get rid of stray a.o, support ncursesw"
introduces support for ncursesw so a small feature enhancement was
sneaking in too. ncursesw giver nicer looking graphichs on text-only
usgae (if available).
Sam
Diffstat:
Makefile | 30 ++++++++++++++---------------
scripts/kconfig/confdata.c | 2 -
scripts/kconfig/gconf.c | 2 -
scripts/kconfig/lxdialog/Makefile | 6 ++---
scripts/kconfig/lxdialog/check-lxdialog.sh | 24 +++++++++++++++++------
scripts/kconfig/mconf.c | 2 -
scripts/kconfig/symbol.c | 5 +---
7 files changed, 41 insertions(+), 30 deletions(-)
Patches has been sent to lkml in response to the submitters.
Change log entries:
commit df9df036d356078679a60135fba65f79cd6153d0
Author: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Mon Jan 16 12:46:07 2006 +0100
kbuild: fix 'make all install_modules install'
The command 'make all modules_install install' would fail
in a virgin tree - pointing at a non-existing directory under
/lib/modules/xxx
KERNELRELEASE is part of MODLIB and we need to create .kernelrelease
before we can properly evaluate KERNELRELEASE,
Changing MODLIB to the recursively expanded flavor let it pick up
the correct KERNELRELEASE value.
Reported by: "Hemmann, Volker Armin" <volker.armin.hemmann@tu-clausthal.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
commit 2244cbd8a9185c197ec5ba5de175aec288697223
Author: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Mon Jan 16 12:12:12 2006 +0100
kbuild: create .kernelrelease at *config step
To enable 'make kernelrelease' earlier now create .kernelrelease when
one of the *config targets are used.
Also introduce KERNELVERSION - only user is kconfig.
KERNELVERSION was needed to display kernel version in menuconfig -
KERNELRELEASE is not valid until configuration has completed.
kconfig files modified to use KERNELVERSION.
Bug reported by: Rene Rebe <rene@exactcode.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
commit 296e0855b0f9a4ec9be17106ac541745a55b2ce1
Author: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Sun Jan 15 20:02:31 2006 +0100
kbuild: fix make -jN with multiple targets with O=...
The way multiple targets was handled with make O=...
broke because for each high-level target make spawned
a parallel make resulting in a broken build.
Reported by Keith Owens <kaos@ocs.com.au>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
commit 60f33b80443a3e7e79e2a3ddc625ab6246a61d3d
Author: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Sun Jan 15 15:28:35 2006 +0100
kconfig: get rid of stray a.o, support ncursesw
scripts/kconfig/lxdialog/check-lxdialog.sh uses gcc to check for
what libraries are present. Redirect output to /dev/null
so we do not generate an a.out.
Also included support for ncursesw - so if present prefer that
instead of ncurses.
The order is now (first is preferred):
1) ncursesw
2) ncurses
3) curses
The latter is to support SunOS.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [GIT PATCH] kbuild fixes
@ 2008-05-19 18:25 Sam Ravnborg
0 siblings, 0 replies; 2+ messages in thread
From: Sam Ravnborg @ 2008-05-19 18:25 UTC (permalink / raw)
To: Linus Torvalds, LKML, linux-kbuild
Cc: Jan Blunck, Christophe Jaillet, Randy Dunlap, Paulo Marques,
S. Çağlar Onur, Andi Kleen, Masatake YAMATO
Hi Linus.
Please pull from:
ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
Following fixes has been collected:
Andi Kleen (1):
kbuild: disable modpost warnings for linkonce sections
Christophe Jaillet (1):
kconfig: incorrect 'len' field initialisation ?
Jan Blunck (1):
Don't clean bounds.h and asm-offsets.h
Masatake YAMATO (1):
kbuild: escape meta characters in regular expression in make TAGS
Randy Dunlap (1):
kernel-doc: allow unnamed bit-fields
S.Çağlar Onur (1):
Remove *.rej pattern from .gitignore
Sam Ravnborg (2):
MAINTAINERS: document names of new kbuild trees
kbuild: filter away debug symbols from kernel symbols
The kernel-doc patch is not a real 'fix' as such.
But as the patch most likely does not prevent your systems from
booting I took it here too.
Sam
.gitignore | 1 -
Kbuild | 3 +--
MAINTAINERS | 3 ++-
Makefile | 3 ++-
scripts/kallsyms.c | 3 +++
scripts/kconfig/util.c | 2 +-
scripts/kernel-doc | 4 +++-
scripts/mksysmap | 3 ++-
scripts/mod/modpost.c | 2 +-
9 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index 090b293..9c0d650 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,5 @@ series
cscope.*
*.orig
-*.rej
*~
\#*#
diff --git a/Kbuild b/Kbuild
index 32f19c5..e750e9c 100644
--- a/Kbuild
+++ b/Kbuild
@@ -96,5 +96,4 @@ missing-syscalls: scripts/checksyscalls.sh FORCE
$(call cmd,syscalls)
# Delete all targets during make clean
-clean-files := $(addprefix $(objtree)/,$(targets))
-
+clean-files := $(addprefix $(objtree)/,$(filter-out $(bounds-file) $(offsets-file),$(targets)))
diff --git a/MAINTAINERS b/MAINTAINERS
index f5583dc..74b1c55 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2318,7 +2318,8 @@ S: Maintained
KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
P: Sam Ravnborg
M: sam@ravnborg.org
-T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
+T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-next.git
+T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
L: linux-kbuild@vger.kernel.org
S: Maintained
diff --git a/Makefile b/Makefile
index 4492984..f18631f 100644
--- a/Makefile
+++ b/Makefile
@@ -1114,6 +1114,7 @@ MRPROPER_DIRS += include/config include2 usr/include
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
include/linux/autoconf.h include/linux/version.h \
include/linux/utsrelease.h \
+ include/linux/bounds.h include/asm*/asm-offsets.h \
Module.symvers tags TAGS cscope*
# clean - Delete most, but leave enough to build external modules
@@ -1431,7 +1432,7 @@ define xtags
elif $1 --version 2>&1 | grep -iq emacs; then \
$(all-sources) | xargs $1 -a; \
$(all-kconfigs) | xargs $1 -a \
- --regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \
+ --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \
$(all-defconfigs) | xargs -r $1 -a \
--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
else \
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 5d20a2e..ad2434b 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -108,6 +108,9 @@ static int read_symbol(FILE *in, struct sym_entry *s)
/* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
else if (str[0] == '$')
return -1;
+ /* exclude debugging symbols */
+ else if (stype == 'N')
+ return -1;
/* include the type field in the symbol name, so that it gets
* compressed together */
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index f8e73c0..3cc9f93 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -77,7 +77,7 @@ struct gstr str_new(void)
{
struct gstr gs;
gs.s = malloc(sizeof(char) * 64);
- gs.len = 16;
+ gs.len = 64;
strcpy(gs.s, "\0");
return gs;
}
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 83cee18..88e3934 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1556,7 +1556,9 @@ sub create_parameterlist($$$) {
push_parameter($2, "$type $1", $file);
}
elsif ($param =~ m/(.*?):(\d+)/) {
- push_parameter($1, "$type:$2", $file)
+ if ($type ne "") { # skip unnamed bit-fields
+ push_parameter($1, "$type:$2", $file)
+ }
}
else {
push_parameter($param, $type, $file);
diff --git a/scripts/mksysmap b/scripts/mksysmap
index 4390fab..6e133a0 100644
--- a/scripts/mksysmap
+++ b/scripts/mksysmap
@@ -32,6 +32,7 @@
# For System.map filter away:
# a - local absolute symbols
# U - undefined global symbols
+# N - debugging symbols
# w - local weak symbols
# readprofile starts reading symbols when _stext is found, and
@@ -40,5 +41,5 @@
# so we just ignore them to let readprofile continue to work.
# (At least sparc64 has __crc_ in the middle).
-$NM -n $1 | grep -v '\( [aUw] \)\|\(__crc_\)\|\( \$[adt]\)' > $2
+$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)' > $2
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 757294b..508c589 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -721,7 +721,7 @@ static int check_section(const char *modname, const char *sec)
/* consume all digits */
while (*e && e != sec && isdigit(*e))
e--;
- if (*e == '.') {
+ if (*e == '.' && !strstr(sec, ".linkonce")) {
warn("%s (%s): unexpected section name.\n"
"The (.[number]+) following section name are "
"ld generated and not expected.\n"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-19 18:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-16 11:56 [GIT PATCH] kbuild fixes Sam Ravnborg
2008-05-19 18:25 Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®