Commit graph android_kernel_sony_sdm845/Makefile
Message SHA1
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Linus Torvalds   commited 2006-01-16 11:19:04 -08:00
9d8d5a284e
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>

Sam Ravnborg   commited 2006-01-16 12:46:07 +01:00
df9df036d3
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>

Sam Ravnborg   commited 2006-01-16 12:12:12 +01:00
2244cbd8a9
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>

Sam Ravnborg   commited 2006-01-15 20:02:31 +01:00
296e0855b0
powerpc: Make ARCH=powerpc the default for 32-bit ppc
This makes ARCH=powerpc the default on 32-bit powerpc machines,
where uname -m returns ppc, as well as on 64-bit powerpc machines.
Most people who would be likely to build their own kernels on
32-bit powerpc machines would be using powermacs or CHRP machines,
both of which are supported with ARCH=powerpc now.  Embedded ppc
developers whose ports haven't been moved over to arch/powerpc
yet will have to explicitly set ARCH=ppc now.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Paul Mackerras   commited 2006-01-15 17:33:52 +11:00
820a8ce793
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile

Linus Torvalds   commited 2006-01-10 08:21:33 -08:00
ab396e91bf
spelling: s/usefull/useful/
Signed-off-by: Adrian Bunk <bunk@stusta.de>

Adrian Bunk   commited 2006-01-10 00:08:17 +01:00
a58a414fd5
kbuild: re-export VERSION, PATCHLEVEL, SUBLEVEL
Eric Sandeen <sandeen@sgi.com> pointed out that it is usefull to have
access to VERSION, PATCHLEVEL, SUBLEVEL in external modules, and gooling
a litte confirmed this.
So re-export them.
Usage within the kernel is still discouraged but possible.

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

Sam Ravnborg   commited 2006-01-09 22:48:34 +01:00
4f0210b9c4
kbuild: KERNELRELEASE is only re-defined when buiding the kernel
To avoid running setlocalversion as root no longer (re-)define
KERNELRELEASE for each run. With this patch KERNELRELEASE is
only re-read when we do an actual kernel build.
Rationale behind this is "do as little as possible" when executing
make install - as root!

A new file named .kernelrelease is strored in the root of the kernel
tree containing the actual version string.
So when we use do a kernel build the .kernelrelease file will be updated.
But in all other situations it is left as-is.

To make it more visible the kernel now prints out the version being build.
Sample:
Building kernel 2.6.15-g63b794bf-dirty
...
...

The patch also un-exports VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION LOCALVERSION
since all users of these are anyway broken - and none is left in the
tree.

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

Sam Ravnborg   commited 2006-01-09 21:20:34 +01:00
cb58455c48
kbuild: ensure mrproper removes .old_version
If the final linking of vmlinux fails, the file .old_version are left
behind.  This patch ensures the mrproper target will remove it if
present.

Signed-off-by: Tore Anderson <tore@fud.no>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Tore Anderson   authored and   Sam Ravnborg   commited 2006-01-08 18:46:49 +01:00
50aa88e287
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Linus Torvalds   commited 2006-01-04 16:36:52 -08:00
25c862cc9e
Linux v2.6.15
Hey, it's fifteen years today since I bought the machine that got Linux
started.  January 2nd is a good date.

Linus Torvalds   commited 2006-01-02 19:21:10 -08:00
88026842b0
kbuild: always run 'make silentoldconfig' when tree is cleaned
If the file .kconfig.d is missing then make sure to run
'make silentoldconfig', since we have no way to detect if
a Kconfig file has been updated.

-kconfig.d is created by kconfig and is removed as part
of 'make clean' so the situation is likely to occur in reality.

Jan Beulich <JBeulich@novell.com> reported this bug.

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

Sam Ravnborg   commited 2005-12-26 23:34:03 +01:00
752625cff3
kbuild: tags file generation fixup
Here is a fixup for tags file generation, for proper tags of
__releases/__acquires functions.

Signed-off-by: samuel.thibault@ens-lyon.org
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Samuel Thibault   authored and   Sam Ravnborg   commited 2005-12-26 23:19:55 +01:00
54e08a2392
kbuild: Add ctags support for function prototypes and external variable declarations
This patch adds function prototypes and external variable declarations
to the set of tag kinds when running ctags. I find this useful when
perusing the kernel. Please apply.

Signed-off-by: John Kacur <jkacur@rogers.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

John Kacur   authored and   Sam Ravnborg   commited 2005-12-25 21:29:38 +01:00
f6333eb4e7
Linux v2.6.15-rc7
Ho ho ho.

Linus Torvalds   commited 2005-12-24 15:47:48 -08:00
f89f5948fc
Linux v2.6.15-rc6
Also renamed in honor of Portland being snowed in and everybody sliding
around on the highways like greased pumpkins.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Linus Torvalds   commited 2005-12-18 16:36:54 -08:00
df7addbb45
kbuild: document INSTALL_MOD_PATH in 'make help'
Signed-Off-By: Bodo Eggert <7eggert@gmx.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Bodo Eggert   authored and   Sam Ravnborg   commited 2005-12-16 23:19:45 +01:00
9cc5d74c84
[PATCH] kbuild: remove the deprecated check_gcc
check_gcc has been deprecated for quite some time.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Adrian Bunk   authored and   Sam Ravnborg   commited 2005-12-16 21:48:02 +01:00
cb1a7b4df7
[PATCH] KERNELRELEASE depends on CONFIG_LOCALVERSION
Sam Ravnborg <sam@ravnborg.org> writes:

> Author: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
>
>     [PATCH] kbuild: make kernelrelease in unconfigured kernel prints an error
>
>     Do not include .config for target kernelrelease

This is wrong.  KERNELRELEASE depends on CONFIG_LOCALVERSION, thus you
need .config.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Andreas Schwab   authored and   Linus Torvalds   commited 2005-12-12 08:57:42 -08:00
6b6a462c4a
Linux v2.6.15-rc5
Hey, for no other reason than the fact that I'll be off-line for a
week.

Of course, I could force everybody to just use git (and when I'm emperor
of the world, don't think I won't!), but it seems some people want to
just test official releases.  Even if they are just -rc's.

By the time I'm back, Andrew will have fixed all my bugs, and I'll
release it as 2.6.15 and take all the credit.

Mwahahahaaa

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Linus Torvalds   commited 2005-12-03 21:10:42 -08:00
436b0f76f2
Linux v2.6.15-rc4
Linus Torvalds   commited 2005-11-30 22:25:15 -08:00
5666c0947e
Linux v2.6.15-rc3
Linus Torvalds   commited 2005-11-28 19:51:27 -08:00
624f54be20
Linux v2.6.15-rc2
Linus Torvalds   commited 2005-11-19 19:25:03 -08:00
3bedff1d73
[PATCH] Kbuild: index asm-$(SUBARCH) headers for UML
In Uml, many definitions are borrowed from underlying subarch headers (with
#include <asm/arch/stuff.h>).  And it has become annoying to keep switching
tag files all time, so by default index the underlying subarch headers too.
Btw, it adds negligible space to the tags file (less than 1M surely, IIRC it
was around 500k over 40M).

Finally, preserve the ALLSOURCE_ARCHS command line option (I hope) - if it is
set, it is used for headers too as before.  But check my construct please, I
didn't test this.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paolo 'Blaisorblade' Giarrusso   authored and   Linus Torvalds   commited 2005-11-13 18:14:14 -08:00
2ab23c95a0
Linux v2.6.15-rc1
As per the new release rules: two weeks of merging, and then an -rc1 and
calming down for the next release.

Linus Torvalds   commited 2005-11-11 17:43:36 -08:00
cd52d1ee9a
ppc64: default build as the merged 'powerpc' architecture
After the last merge of the new unified 'powerpc' architecture, ppc64 no
longer compiles cleanly as a standalone architecture.  Some bits and
pieces still exist as files under the old ppc64 hierarchy, but the old
"ARCH=ppc64" is dead.

So if "uname" says ppc64, that now implies that the default architecture
should be "powerpc".

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Linus Torvalds   commited 2005-11-11 14:27:32 -08:00
39990b5eb9
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Linus Torvalds   commited 2005-11-10 13:45:34 -08:00
b8cbfa6924
[PATCH] kbuild: build breaks after -imacros was introduced
I have to revert the recent addition of -imacros to the Makefile to get my
tool chain to build.  Without the change, below, I get:

Note that this looks entirely like a toolchain bug.  Here is the offending command:

[pid 12163] execve("/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/tradcpp0", ["/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/tradcpp0", "-lang-asm", "-nostdinc", "-Iinclude", "-Iinclude/asm-i386/mach-default", "-D__GNUC__=3", "-D__GNUC_MINOR__=2", "-D__GNUC_PATCHLEVEL__=2", "-D__GXX_ABI_VERSION=102", "-D__ELF__", "-Dunix", "-D__gnu_linux__", "-Dlinux", "-D__ELF__", "-D__unix__", "-D__gnu_linux__", "-D__linux__", "-D__unix", "-D__linux", "-Asystem=posix", "-D__NO_INLINE__", "-D__STDC_HOSTED__=1", "-Acpu=i386", "-Amachine=i386", "-Di386", "-D__i386", "-D__i386__", "-D__tune_i386__", "-D__KERNEL__", "-D__ASSEMBLY__", "-isystem", "/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/include", "-imacros", "include/linux/autoconf.h", "-MD", "arch/i386/kernel/.entry.o.d", "arch/i386/kernel/entry.S", "-o", "/tmp/ccOlsFJR.s"]

Which should execute properly, I think.  But it does not:

zach-dev:linux-2.6.14-zach-work $ make
  CHK     include/linux/version.h
  CHK     include/linux/compile.h
  CHK     usr/initramfs_list
  AS      arch/i386/kernel/entry.o
/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/tradcpp0: output filename specified twice
make[1]: *** [arch/i386/kernel/entry.o] Error 1
make: *** [arch/i386/kernel] Error 2

gcc (GCC) 3.2.2 20030222 (Red Hat Linux 3.2.2-5)

Deprecating the -imacros fixes the build for me.  It does not appear to be a
simple argument overflow problem in trapcpp0, since deprecating all the defines
reproduces the problem as well.  Also, switching -imacros to -include fixes the
problem.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Zachary Amsden   authored and   Sam Ravnborg   commited 2005-11-10 21:49:10 +01:00
e623a3b808
[PATCH] kbuild: make kernelrelease in unconfigured kernel prints an error
Do not include .config for target kernelrelease

Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Uwe Zeisberger   authored and   Sam Ravnborg   commited 2005-11-09 22:20:01 +01:00
ac4d5f74a9
Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds   commited 2005-11-07 08:32:39 -08:00
333c47c847
[PATCH] kbuild: permanently fix kernel configuration include mess
Include autoconf.h into every kernel compilation via the gcc command line
using -imacros.  This ensures that we have the kernel configuration
included from the start, rather than relying on each file having #include
<linux/config.h> as appropriate.  History has shown that this is something
which is difficult to get right.

Since we now include the kernel configuration automatically, make
configcheck becomes meaningless, so remove it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Russell King   authored and   Sam Ravnborg   commited 2005-11-06 10:22:04 +01:00
2dd34b488a
[BLOCK] Move all core block layer code to new block/ directory
drivers/block/ is right now a mix of core and driver parts. Lets move
the core parts to a new top level directory. Al will move the fs/
related block parts to block/ next.

Signed-off-by: Jens Axboe <axboe@suse.de>

Jens Axboe   commited 2005-11-04 08:43:35 +01:00
3a65dfe8c0
[PATCH] Ensure that 'make distclean' does not delete files in '.git'
Currently, 'make distclean' causes stgit to barf since it may delete
files in .git/patches.  We really shouldn't allow 'make distclean'
anywhere near .git...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Trond Myklebust   authored and   Linus Torvalds   commited 2005-10-28 13:57:57 -07:00
406119f49d
[PATCH] gfp_t: infrastructure
Beginning of gfp_t annotations:

 - -Wbitwise added to CHECKFLAGS
 - old __bitwise renamed to __bitwise__
 - __bitwise defined to either __bitwise__ or nothing, depending on
   __CHECK_ENDIAN__ being defined
 - gfp_t switched from __nocast to __bitwise__
 - force cast to gfp_t added to __GFP_... constants
 - new helper - gfp_zone(); extracts zone bits out of gfp_t value and casts
   the result to int

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro   authored and   Linus Torvalds   commited 2005-10-28 08:16:46 -07:00
af4ca457ea
Linux v2.6.14
"Better late than never"

Linus Torvalds   commited 2005-10-27 17:02:08 -07:00
741b2252a5
Linux v2.6.14-rc5
The -rc4 release was supposed to be the last -rc, but here goes.  The
RCU fixes and the swiotlb changes need an -rc for final testing.

Linus Torvalds   commited 2005-10-19 23:23:05 -07:00
93918e9afc
[PATCH] Export RCS_TAR_IGNORE for rpm targets
The variable RCS_TAR_IGNORE is used in scripts/packaging/Makefile, but not
exported from the main Makefile, so it's never used.

This results in the rpm targets being very unhappy in quilted trees.

Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Tom Rini   authored and   Linus Torvalds   commited 2005-10-19 23:04:30 -07:00
f9b25fabfd
[PATCH] kbuild: Eliminate build error when KALLSYMS not defined
The following build error happens with 2.6.14-rc4 when CONFIG_KALLSYMS is
not defined.  The error message in a fragment of the output was:

  CC      arch/i386/lib/usercopy.o
  AR      arch/i386/lib/lib.a
/bin/sh: line 1: +@: command not found
make[3]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
  CHK     include/linux/compile.h

Signed-off-by: Mark Rustad <mrustad@mac.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mark Rustad   authored and   Linus Torvalds   commited 2005-10-17 17:03:57 -07:00
39ca371c45
Linux v2.6.14-rc4
Linus Torvalds   commited 2005-10-10 18:19:19 -07:00
907a426179
Linux v2.6.14-rc3
Linus Torvalds   commited 2005-09-30 14:17:35 -07:00
1c9426e8a5
Linux v2.6.14-rc2
Avast, ye scurvy land-lubbers! Time to try out a new release.

Arrr!

Linus Torvalds   commited 2005-09-19 20:00:41 -07:00
676d55ae30
Linux 2.6.14-rc1
Two weeks after 2.6.13: starting to calm things down.

Linus Torvalds   commited 2005-09-12 20:12:09 -07:00
2f4ba45a75
kbuild: fix silentoldconfig with make O=
Al Viro reported that sometimes silentoldconfig failed because
output directory was missing.
So create it unconditionally before executing conf

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

Sam Ravnborg   commited 2005-09-11 22:32:57 +02:00
5011cdd01b
kbuild: rename prepare to archprepare to fix dependency chain
When introducing the generic asm-offsets.h support the dependency
chain for the prepare targets was changed. All build scripts expecting
include/asm/asm-offsets.h to be made when using the prepare target would broke.
With the limited number of prepare targets left in arch Makefiles
the trivial solution was to introduce a new arch specific target: archprepare

The dependency chain looks like this now:

prepare
  |
  +--> prepare0
         |
         +--> archprepare
                |
		+--> scripts_basic
                +--> prepare1
                       |
                       +---> prepare2
                               |
                               +--> prepare3

So prepare 3 is processed before prepare2 etc.
This guaantees that the asm symlink, version.h, scripts_basic
are all updated before archprepare is processed.

prepare0 which build the asm-offsets.h file will need the
actions performed by archprepare.

The head target is now named prepare, because users scripts will most
likely use that target, but prepare-all has been kept for compatibility.
Updated Documentation/kbuild/makefiles.txt.

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

Sam Ravnborg   commited 2005-09-11 22:30:22 +02:00
5bb7826900
kbuild: fix generic asm-offsets.h support
iThis fixes a bug where the generated asm-offsets.h file was saved in
the source tree even with make O=.
Thanks to Stephen Rothwell <sfr@canb.auug.org.au> for the report.

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

Sam Ravnborg   commited 2005-09-10 21:05:36 +02:00
8d36a62364
[PATCH] kbuild: fix split-include dependency
Splitting of autoconf.h requires that split-include was built before,
and
needs to be-re-done when split-include changes. This dependency was
previously missing. Additionally, since autoconf.h is (suppoosed to
be)
generated as a side effect of executing config targets, include/linux
should be created prior to running the respective sub-make.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Jan Beulich   authored and   Sam Ravnborg   commited 2005-09-10 14:21:31 +02:00
cd05e6bdc6
[PATCH] kbuild: adjust .version updating
In order to maintain a more correct build number, updates to the
version
number should only be commited after a successful link of vmlinux, not
before (so that errors in the link process don't lead to pointless
increments).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Jan Beulich   authored and   Sam Ravnborg   commited 2005-09-10 14:17:45 +02:00
4e25d8bb95
[PATCH] kbuild: CF=<arguments> passes arguments to sparse
Allows to add to sparse arguments without mutilating makefiles - just
pass CF=<arguments> and they will be added to CHECKFLAGS.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

viro@ZenIV.linux.org.uk   authored and   Sam Ravnborg   commited 2005-09-10 14:15:37 +02:00
7b49bb9aff
[PATCH] kbuild: add kernelrelease to 'make help'
Dunno if there was a conscious decision to leave it out, but if you're
happy with adding some help text for it here's a patch against 2.6.13-mm1..

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

Zach Brown   authored and   Sam Ravnborg   commited 2005-09-10 14:13:36 +02:00
6d12884259