summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2006-01-10Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuildLinus Torvalds1-43/+54
Fix up some trivial conflicts in {i386|ia64}/Makefile
2006-01-10spelling: s/usefull/useful/Adrian Bunk1-1/+1
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-01-10kbuild: re-export VERSION, PATCHLEVEL, SUBLEVELSam Ravnborg1-1/+1
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>
2006-01-09kbuild: KERNELRELEASE is only re-defined when buiding the kernelSam Ravnborg1-42/+53
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>
2006-01-08kbuild: ensure mrproper removes .old_versionTore Anderson1-1/+1
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>
2006-01-05Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuildLinus Torvalds1-13/+17
2006-01-03Linux v2.6.15v2.6.15Linus Torvalds1-1/+1
Hey, it's fifteen years today since I bought the machine that got Linux started. January 2nd is a good date.
2005-12-27kbuild: always run 'make silentoldconfig' when tree is cleanedSam Ravnborg1-4/+6
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>
2005-12-27kbuild: tags file generation fixupSamuel Thibault1-6/+8
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>
2005-12-25kbuild: Add ctags support for function prototypes and external variable ↵John Kacur1-4/+8
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>
2005-12-25Linux v2.6.15-rc7v2.6.15-rc7Linus Torvalds1-1/+1
Ho ho ho.
2005-12-19Linux v2.6.15-rc6v2.6.15-rc6Linus Torvalds1-2/+2
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>
2005-12-17kbuild: document INSTALL_MOD_PATH in 'make help'Bodo Eggert1-1/+1
Signed-Off-By: Bodo Eggert <7eggert@gmx.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-12-16[PATCH] kbuild: remove the deprecated check_gccAdrian Bunk1-4/+0
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>
2005-12-12[PATCH] KERNELRELEASE depends on CONFIG_LOCALVERSIONAndreas Schwab1-1/+1
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>
2005-12-04Linux v2.6.15-rc5v2.6.15-rc5Linus Torvalds1-1/+1
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>
2005-12-01Linux v2.6.15-rc4v2.6.15-rc4Linus Torvalds1-1/+1
2005-11-29Linux v2.6.15-rc3v2.6.15-rc3Linus Torvalds1-1/+1
2005-11-20Linux v2.6.15-rc2v2.6.15-rc2Linus Torvalds1-1/+1
2005-11-14[PATCH] Kbuild: index asm-$(SUBARCH) headers for UMLPaolo 'Blaisorblade' Giarrusso1-1/+12
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>
2005-11-12Linux v2.6.15-rc1v2.6.15-rc1Linus Torvalds1-2/+2
As per the new release rules: two weeks of merging, and then an -rc1 and calming down for the next release.
2005-11-12ppc64: default build as the merged 'powerpc' architectureLinus Torvalds1-1/+2
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>
2005-11-11Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuildLinus Torvalds1-2/+2
2005-11-10[PATCH] kbuild: build breaks after -imacros was introducedZachary Amsden1-1/+1
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>
2005-11-10[PATCH] kbuild: make kernelrelease in unconfigured kernel prints an errorUwe Zeisberger1-1/+1
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>
2005-11-07Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds1-1/+1
2005-11-06[PATCH] kbuild: permanently fix kernel configuration include messRussell King1-6/+2
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>
2005-11-04[BLOCK] Move all core block layer code to new block/ directoryJens Axboe1-1/+1
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>
2005-10-29[PATCH] Ensure that 'make distclean' does not delete files in '.git'Trond Myklebust1-2/+2
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>
2005-10-28[PATCH] gfp_t: infrastructureAl Viro1-1/+1
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>
2005-10-28Linux v2.6.14v2.6.14Linus Torvalds1-1/+1
"Better late than never"
2005-10-20Linux v2.6.14-rc5v2.6.14-rc5Linus Torvalds1-1/+1
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.
2005-10-20[PATCH] Export RCS_TAR_IGNORE for rpm targetsTom Rini1-1/+1
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>
2005-10-18[PATCH] kbuild: Eliminate build error when KALLSYMS not definedMark Rustad1-1/+3
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>
2005-10-11Linux v2.6.14-rc4v2.6.14-rc4Linus Torvalds1-1/+1
2005-10-01Linux v2.6.14-rc3v2.6.14-rc3Linus Torvalds1-1/+1
2005-09-20Linux v2.6.14-rc2v2.6.14-rc2Linus Torvalds1-1/+1
Avast, ye scurvy land-lubbers! Time to try out a new release. Arrr!
2005-09-13Linux 2.6.14-rc1v2.6.14-rc1Linus Torvalds1-2/+2
Two weeks after 2.6.13: starting to calm things down.
2005-09-12kbuild: fix silentoldconfig with make O=Sam Ravnborg1-0/+1
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>
2005-09-12kbuild: rename prepare to archprepare to fix dependency chainSam Ravnborg1-8/+15
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>
2005-09-10kbuild: fix generic asm-offsets.h supportSam Ravnborg1-1/+1
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>
2005-09-10[PATCH] kbuild: fix split-include dependencyJan Beulich1-4/+6
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>
2005-09-10[PATCH] kbuild: adjust .version updatingJan Beulich1-2/+8
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>
2005-09-10[PATCH] kbuild: CF=<arguments> passes arguments to sparseviro@ZenIV.linux.org.uk1-1/+1
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>
2005-09-10[PATCH] kbuild: add kernelrelease to 'make help'Zach Brown1-0/+1
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>
2005-09-09kbuild: full dependency check on asm-offsets.hSam Ravnborg1-28/+11
Building asm-offsets.h has been moved to a seperate Kbuild file located in the top-level directory. This allow us to share the functionality across the architectures. The old rules in architecture specific Makefiles will die in subsequent patches. Furhtermore the usual kbuild dependency tracking is now used when deciding to rebuild asm-offsets.s. So we no longer risk to fail a rebuild caused by asm-offsets.c dependencies being touched. With this common rule-set we now force the same name across all architectures. Following patches will fix the rest. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-09-06Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild Linus Torvalds1-96/+64
2005-09-05[PATCH] kbuild: fix make clean damaging hg reposMatt Mackall1-2/+2
Running 'make clean' was quietly deleting files in Mercurial kernel repositories matching '.*.d', which was corrupting the tags portions of the repository. Spotted and fixed by several people. Signed-off-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-29[PATCH] new name for 2.6.14Benjamin LaHaise1-1/+1
We've had Woozy Numbat for a while now. Here's an updated name care of Jeff Garzik and myself. Signed-off-by: Benjamin LaHaise <bcrl@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-29Linux v2.6.13v2.6.13Linus Torvalds1-1/+1
generated by cgit v1.2.3 (git 2.39.0) at 2024-12-27 14:52:10 +0300