Commit Graph
77919 Commits
Author SHA1 Message Date
EGRY Gabor 534a450c38 kconfig: gettext support for config
Gettext support for conf.c

[Include locale.h by Kyle].

Signed-off-by: Egry Gabor <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
Cc: Kyle McMartin <[email protected]>
2008-01-28 23:14:39 +01:00
EGRY Gabor 75c0a8a55c kconfig: gettext support for lxdialog
Gettext support for lxdialog.

Signed-off-by: Egry Gabor <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:39 +01:00
EGRY Gabor 413f006bab kconfig: gettext support for menuconfig
Full gettext support for menuconfig.

Signed-off-by: Egry Gabor <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:39 +01:00
EGRY Gabor c21a2d9589 kconfig: gettext support for xconfig
Full gettext support for xconfig.

Signed-off-by: Egry Gabor <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:39 +01:00
EGRY Gabor 01771b0fef kconfig: macro fix in menu.c
This patch removes the indirect I18N support for config file.

Signed-off-by: Egry Gabor <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:39 +01:00
EGRY Gabor 46d2631978 kconfig: gettext support for gconfig
Gettext support for menu and toolbar.

Signed-off-by: Egry Gabor <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:39 +01:00
EGRY Gabor bb7ef3905a kconfig: missing macros in gconfig
This patch adds missing gettext macros.

Signed-off-by: Egry Gabor <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:38 +01:00
EGRY Gabor f7a4b4cdc2 kconfig: whitespace removing
This patch removes the unnecessary whitespaces from
end of help lines of Kconfig files.

Signed-off-by: Egry Gabor <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:38 +01:00
EGRY Gabor 1020026f99 kconfig: update-po-config info
This patch adds tracking messages.

Signed-off-by: Egry Gabor <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:38 +01:00
[email protected] 243f40cecb kbuild: document 'make prepare' in 'make help'
The output of 'make help' covers a lot of options, but doesn't include
a listing for 'make prepare'.  Here's a one-liner to fix that...

Signed-off-by: Valdis Kletnieks <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:38 +01:00
Jan Beulich 1d3b3bfab1 kbuild: scripts/mkmakefile: dynamic determination of output directory
Rather than fixing the output directory in the generated Makefile,
determine it from the placement of Makefile. This allows moving
the build tree around or accessing it through different mount paths.

(The lastword definition is a compatibility one for make prior to 3.81;
newer make will simply ignore it and use the [faster] built-in.)

Signed-off-by: Jan Beulich <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:38 +01:00
Sam Ravnborg df578e7d83 kbuild: clean up modpost.c
akpm complained about overly long lines in modpost.c and
when started additional style issues were fixed:

o Updated my copyright
o Removed unneeded {}
o Drop assignments in if ()
o Spaces around operators
o Break long lines
o locate * near variable not type
o Fix a format specifier for sizeof()
o Corrected placement of '{' and '}'
o spaces to tabs (but use tabs only for indention)

modpost.c is not checkpatch clean. Readability were favoured
on top of checkpatch compliance.
But checkpatch were used to find additional stuff to clean up.

Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:38 +01:00
Ladislav Michl 07f7668858 kconfig: use C89 random functions in conf.c
rand and srand functions conform also to C89 in addition to POSIX.1-2001,
which makes them a bit more portable (work also on MinGW host). Linux man
page also says:
"The versions of rand() and srand() in the Linux C Library use the same
random number generator as random() and srandom()".

* Use C89 conformant functions rand() and srand()

Signed-off-by: Ladislav Michl <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:38 +01:00
Ladislav Michl 75ff4309cd kconfig: fix whitespace and sort includes in conf.c
Sort includes and remove leading whitespace.

Signed-off-by: Ladislav Michl <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]
2008-01-28 23:14:38 +01:00
Uwe Kleine-König 2c81210a26 kbuild: ignore cache modifiers for generating the tags files
With this patch I'm able to find the definition of _xmit_lock defined in
include/linux/netdevice.h as follows:

	struct net_device {
		...
		spinlock_t _xmit_lock ____cacheline_aligned_in_smp;
	}

Otherwise this counts as definition of ____cacheline_aligned_in_smp.

Signed-off-by: Uwe Kleine-König <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:38 +01:00
Sam Ravnborg de83cf148a kconfig: delete unused FILE_ and SYMBOL_ flags
The *_PRINTED flags were never used - so delete them.
Do we need them later then we can re-add them.

Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:38 +01:00
Sam Ravnborg d6ee35764f kconfig: rename E_OR & friends to avoid name clash
We had macros named the same as a set of enumeration values.
It is legal code but very confusing to read - so rename
the macros from E_* to EXPR_*

Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:38 +01:00
Jan Engelhardt d84876f9f8 kconfig: allow overriding symbols
Allow config variables in .config to override earlier ones in the same
file. In other words,

	# CONFIG_SECURITY is not defined
	CONFIG_SECURITY=y

will activate it. This makes it a bit easier to do

cat original-config myconfig myconfig2 ... >.config;
and run *config as expected.

Signed-off-by: Jan Engelhardt <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
Cc: Randy Dunlap <[email protected]>
2008-01-28 23:14:37 +01:00
Ladislav Michl 09af091f50 kconfig: make kconfig MinGW friendly
Kconfig is powerfull tool. So powerfull that more and more software
projects are using it for configuration. So instead of fixing some of
them one by one, lets fix it in kernel and wait for sync.

This work was originaly done for PTXdist - GPL licensed build system for
userlands and cross-compilers, but it will not hurt kernel kconfig
either. PTXdist menuconfig now works on Windows linked with PDCurses and
compiled using MinGW - there is no termios and signals.

* Do not include <sys/wait.h> and <signal.h> (comes from times when
  lxdialog was separate process)
* Do not mess with termios directly and let curses tell screen size.
  Comment to commit c8dc68ad0f says
  check for screen size could be removed later, but because it didn't
  happen for more than year I left it here as well.
* Save cursor position added by Sam

Signed-off-by: Ladislav Michl <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:37 +01:00
Randy Dunlap 0486bc9098 kconfig: add hints/tips/tricks to Documentation/kbuild/kconfig-language.txt
Add a section on kconfig hints: how to do <something> in Kconfig files.

Fix a few typos/spellos.

Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:37 +01:00
Theodore Ts'o b052ce4c84 kbuild: fix false positive -dirty tag caused by make-kpkg
make-kpkg modifies scripts/package/Makefile and deletes
scripts/package/builddeb as part of its build process.  Ignore these
changes so the tree isn't marked as -dirty, when it is just an
artifact of make-kpkg.  (make-kpkg clean restores the files to their
original state, and these helper scripts won't affect the final
compiled kernel in any way.)

Signed-off-by: "Theodore Ts'o" <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:37 +01:00
Theodore Ts'o 4e7434ff02 kbuild: fix scripts/setlocalversion to avoid erroneous -dirty tag
If git's index file is out of date, and some files have been touched
such that their timestamp doesn't what is in the index, "git
diff-index HEAD" may show that a particular file is dirty, when in
fact it really isn't.  Running "git update-index" will update the
index to avoid these false positives.

Signed-off-by: "Theodore Ts'o" <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:37 +01:00
Theodore Ts'o d882421f4e kbuild: change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format
Change the automatic local version to have the form -nnnnn-gSHA1SUMID,
where 'nnnnn' is the number of commits since the last tag (i.e.,
2.6.21-rc7).  This makes it much more likely that the package names created
for the kernel will look "newer" to a package manager.

Signed-off-by: "Theodore Ts'o" <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:37 +01:00
Andreas Mohr 22d6a6a018 kbuild: eradicate bashisms in scripts/patch-kernel
Make the patch-kernel shell script sufficiently compatible with POSIX
shells, i.e., remove bashisms from scripts/patch-kernel.
This means that it now also works on dash 0.5.3-5
and still works on bash 3.1dfsg-8.

Full changelog:
- replaced non-standard "==" by standard "="
- replaced non-standard "source" statement by POSIX "dot" command
- use leading ./ on mktemp filename to force the tempfile to a local
  directory, so that the search path is not used
- replace bash syntax to remove leading dot by similar POSIX syntax
- added missing (optional/not required) $ signs to shell variable names

Signed-off-by: Andreas Mohr <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:37 +01:00
WANG Cong 7491a76b23 FS: Remove dead code
Remove dead code in smbfs makefile.

Cc: Al Viro <[email protected]>
Cc: Tim Shimmin <[email protected]>
Signed-off-by: WANG Cong <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:37 +01:00
WANG Cong abee8ed09a FRV: Drop 'TOPDIR' from Makefiles
This patch drops TOPDIR from frv Makefiles.

Cc: David Howells <[email protected]>
Signed-off-by: WANG Cong <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:37 +01:00
WANG Cong aff5905778 INFINIBAND: Remove 'TOPDIR' from Makefiles
This patch removes TOPDIR from infiniband Makefile and delete
one include statement pointing to a non-existing directory

Cc: Roland Dreier <[email protected]>
Cc: Sean Hefty <[email protected]>
Cc: Hal Rosenstock <[email protected]>
Signed-off-by: WANG Cong <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:37 +01:00
WANG Cong 42d71c44d5 CRIS: Remove 'TOPDIR' from Makefiles
This patch removes TOPDIR from Cris Makefiles.

Cc: Mikael Starvik <[email protected]>
Cc: Jesper Nilsson <[email protected]>
Cc: Andreas Schwab <[email protected]>
Signed-off-by: WANG Cong <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Acked-by: Jesper Nilsson <[email protected]>
2008-01-28 23:14:37 +01:00
Sam Ravnborg 9b213118fa kbuild: fix installing external modules
Eric Sandeen <[email protected]> reported:
  Installing external modules is supposed to put them in some path
  under /lib/modules/<version>/extra/subdir/, but this change:
  http://linux.bkbits.net:8080/linux-2.6/?PAGE=cset&REV=1.1982.9.23
  makes them go under /lib/modules/<version>/extrasubdir

 (for example, make M=fs/ext3 modules_install puts ext3.ko in
 /lib/modules/<version>/extrafs/ext3.ko)

This was the case only when specifying a trailing slash to M=..

Fixed by removing trailing slash if present so
we correctly match dir part of target.

Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Eric Sandeen <[email protected]>
2008-01-28 23:14:36 +01:00
Robert P. J. Day 7998a73166 A few corrections to include/linux/Kbuild
auxvec.h, i2c-dev.h and vt.h *should* be unifdef'ed i2o-dev.h does not need
unifdef'ing

Signed-off-by: Robert P. J. Day <[email protected]>
Cc: David Woodhouse <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:36 +01:00
Mike Frysinger 36091fd348 kbuild: fixup genksyms usage/getopt
The usage does not mention the "-a,--arch" or "-T,--dump-types" options, so
add them.  The calls to getopt() seem to mention options that no longer exist
(some "k" and "p" thingy) but omits the "h" option which means using '-h'
actually triggers the error code path, so update those as well.

Signed-off-by: Mike Frysinger <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:36 +01:00
Sam Ravnborg c6025f4c8b kbuild: ignore *.order files
Introducing the new modules.order patch created a number
of additional files. Teach git to ignore them.

Signed-off-by: Sam Ravnborg <[email protected]>
Acked-by: Tejun Heo <[email protected]>
2008-01-28 23:14:36 +01:00
Sam Ravnborg 0484f1299f kbuild: fix buglet in gcc-version.sh
Greg Schafer <[email protected]> reported:
====
$make mrproper
scripts/gcc-version.sh: [[: command not found

This is on a very old host with an ancient bash as /bin/sh. But I have
CONFIG_SHELL set and pointing to a modern bash. Something is wrong.

This doesn't happen with 2.6.23
====

Fixed using a more common string equality test.

Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Greg Schafer <[email protected]>
Cc: Jesper Juhl <[email protected]>
2008-01-28 23:14:36 +01:00
Robert P. J. Day 899c38420c Kbuild: Clarify the rpm-related make packaging targets
Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:36 +01:00
Aron Griffis 3dce174cfc kbuild: support mercurial in setlocalversion
This represents mercurial changesets similarly to git.  For untagged
revisions, append the changeset id.  If there are uncommitted changes,
append -dirty.  For example, -hgc60016ba6237-dirty

Signed-off-by: Aron Griffis <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:36 +01:00
Andres Salomon 2f4b489b77 kconfig: use getopt() in conf.c for handling command line arguments
Switch from doing our own parsing of command line arguments to
using getopt(3) to do it.  Aside from simplifying things, this allows us to
specify multiple arguments; the old code could only accept two arguments
(input_mode and kconfig name).

Note some subtle changes:
 - The argument '-?' is no longer supported.
 - '-h' is not treated as an error, so output goes to stdout, and we
   exit with '0'.
 - There is no compatibility checking amongst arguments; the last option
   will simply override earlier options.  For example, 'conf -n -y foo'
   is perfectly valid now (input_mode will be set_yes).  Previously, that
   would have been an error ("can't find file -y").

Signed-off-by: Andres Salomon <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Roman Zippel <[email protected]>
2008-01-28 23:14:36 +01:00
Andi Kleen 666ab414fe kbuild: fix a buffer overflow in modpost
When passing an file name > 1k the stack could be overflowed.
Not really a security issue, but still better plugged.
Signed-off-by: Andi Kleen <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:36 +01:00
Andi Kleen 58b7a68de3 kbuild: fix format string warnings in modpost
Fix wrong format strings in modpost exposed by the previous patch.
Including one missing argument -- some random data was printed instead.
Signed-off-by: Andi Kleen <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:36 +01:00
Andi Kleen 6d9a89ea4b kbuild: declare the modpost error functions as printf like
This way gcc can warn for wrong format strings
Signed-off-by: Andi Kleen <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:36 +01:00
Sam Ravnborg 6e588f6dcf kconfig: if ncurses-devel is missing then say so
With this patch when ncurses-devel (or whatever it is named)
is missing trying to run menuconfig will result in this:

$ make menuconfig
  HOSTCC  scripts/kconfig/conf.o
  HOSTCC  scripts/kconfig/kxgettext.o
 *** Unable to find the ncurses libraries or the
 *** required header files.
 *** 'make menuconfig' requires the ncurses libraries.
 ***
 *** Install ncurses (ncurses-devel) and try again.
 ***
make[1]: *** [scripts/kconfig/dochecklxdialog] Error 1
make: *** [menuconfig] Error 2

Much better than before where we just listed some build errors.
The other *config targets will work indepenednt on ncurses
being present or not.

Includes improvements suggested by: Frans Pop <[email protected]>

Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Frans Pop <[email protected]>
2008-01-28 23:14:36 +01:00
Tejun Heo 551559e13a kbuild: implement modules.order
When multiple built-in modules (especially drivers) provide the same
capability, they're prioritized by link order specified by the order
listed in Makefile.  This implicit ordering is lost for loadable
modules.

When driver modules are loaded by udev, what comes first in
modules.alias file is selected.  However, the order in this file is
indeterministic (depends on filesystem listing order of installed
modules).  This causes confusion.

The solution is two-parted.  This patch updates kbuild such that it
generates and installs modules.order which contains the name of
modules ordered according to Makefile.  The second part is update to
depmod such that it generates output files according to this file.

Note that both obj-y and obj-m subdirs can contain modules and
ordering information between those two are lost from beginning.
Currently obj-y subdirs are put before obj-m subdirs.

Sam Ravnborg cleaned up Makefile modifications and suggested using awk
to remove duplicate lines from modules.order instead of using separate
C program.

Signed-off-by: Tejun Heo <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
Cc: Bill Nottingham <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: Kay Sievers <[email protected]>
Cc: Jon Masters <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Johannes Berg 9e233625fb convert drivers/base/power/Makefile to ccflags
This patch converts drivers/base/power/Makefile to use ccflags instead
of EXTRA_CFLAGS.

Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Geert Uytterhoeven 8000743455 kbuild: Add missing srctree prefix for includecheck and versioncheck
Add missing $(srctree)/ prefix for scripts used by the includecheck and
versioncheck make targets

Signed-off-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Sam Ravnborg aa025e7d5c kbuild: document versioncheck in make help
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Randy Dunlap ec2d987f98 kbuild: add 'includecheck' help text
Add 'includecheck' to the Static analyzers help list.

Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Johannes Berg e662af4281 kernel-doc: new P directive for DOC: sections
The !P directive includes the contents of a DOC: section
given by title, e.g.
!Pfilename Title of the section

Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Johannes Berg 2e95972c44 kernel-doc: use no-doc option
When asked by a template to include all functions from a file,
it will also include DOC: sections wreaking havoc in the generated
docbook file. This patch makes it use the new -no-doc-sections
flag for kernel-doc to avoid this.

Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Johannes Berg 4b44595a7b kernel-doc: process functions, not DOC:
This flag is necessary for the next patch for docproc to output
only the functions and not DOC: sections when a function list
is requested.

Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Johannes Berg b112e0f73f kernel-doc: single DOC: selection
Currently, DOC: sections are always output even if only a single
function is requested, fix this and also make it possible to just
output a single DOC: section by giving its title as the function
name to output.

Also fixes docbook XML well-formedness for sections with examples.

Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00
Johannes Berg 1b9bc22d71 kernel-doc: init kernel version
The kernel-doc script triggers a perl warning when invoked
without KERNELVERSION in the environment, rather make it use
the string "unknown kernel version" instead.

Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
2008-01-28 23:14:35 +01:00