summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)Author
2005-11-13[PATCH] Kbuild: index asm-$(SUBARCH) headers for UMLPaolo 'Blaisorblade' Giarrusso
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-11Linux v2.6.15-rc1v2.6.15-rc1Linus Torvalds
As per the new release rules: two weeks of merging, and then an -rc1 and calming down for the next release.
2005-11-11ppc64: default build as the merged 'powerpc' architectureLinus Torvalds
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-10Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuildLinus Torvalds
2005-11-10[PATCH] kbuild: build breaks after -imacros was introducedZachary Amsden
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-09[PATCH] kbuild: make kernelrelease in unconfigured kernel prints an errorUwe Zeisberger
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 Torvalds
2005-11-06[PATCH] kbuild: permanently fix kernel configuration include messRussell King
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 Axboe
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-28[PATCH] Ensure that 'make distclean' does not delete files in '.git'Trond Myklebust
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 Viro
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-27Linux v2.6.14v2.6.14Linus Torvalds
"Better late than never"
2005-10-19Linux v2.6.14-rc5v2.6.14-rc5Linus Torvalds
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-19[PATCH] Export RCS_TAR_IGNORE for rpm targetsTom Rini
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-17[PATCH] kbuild: Eliminate build error when KALLSYMS not definedMark Rustad
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-10Linux v2.6.14-rc4v2.6.14-rc4Linus Torvalds
2005-09-30Linux v2.6.14-rc3v2.6.14-rc3Linus Torvalds
2005-09-19Linux v2.6.14-rc2v2.6.14-rc2Linus Torvalds
Avast, ye scurvy land-lubbers! Time to try out a new release. Arrr!
2005-09-12Linux 2.6.14-rc1v2.6.14-rc1Linus Torvalds
Two weeks after 2.6.13: starting to calm things down.
2005-09-11kbuild: fix silentoldconfig with make O=Sam Ravnborg
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-11kbuild: rename prepare to archprepare to fix dependency chainSam Ravnborg
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 Ravnborg
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 Beulich
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 Beulich
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.uk
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 Brown
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 Ravnborg
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 Torvalds
2005-09-05[PATCH] kbuild: fix make clean damaging hg reposMatt Mackall
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 LaHaise
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-28Linux v2.6.13v2.6.13Linus Torvalds
2005-08-23Linux v2.6.13-rc7v2.6.13-rc7Linus Torvalds
Too many changes to release a final 2.6.13.
2005-08-10[PATCH] kbuild: automatically append a short string to the version based ↵Ryan Anderson
upon the git commit If CONFIG_AUTO_LOCALVERSION is set, the user is using a git-based tree, and the current HEAD is not referred to by any tags in .git/refs/tags/, append -g and the first 8 characters of the commit to the version string. This makes it easier to use git-bisect, and/or to do a daily build, without trampling on your older, working builds, or accidentally setting up conflicting sets of modules. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-08-07Linux 2.6.13-rc6v2.6.13-rc6Linus Torvalds
Last (?) -rc, partly brought on by the aic7xxx performance fixes (ie get them tested in an -rc release before the real 2.6.13).
2005-08-01Linux v2.6.13-rc5v2.6.13-rc5Linus Torvalds
Ok, let's get it right this time
2005-07-28Linux 2.6.13-rc4v2.6.13-rc4Linus Torvalds
2005-07-28kbuild: fix make TAGS (for emacs use)Sam Ravnborg
From: bongiojp@clarkson.edu <Jeremy Bongio> make TAGS does not make source code tags for emacs. It instead returns an error than "etags -" isn't valid. The problem is easily remedied. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-07-27kbuild: silence mystery messageSam Ravnborg
During last phase of the build the following message were displayed: /bin/sh: +@: command not found This message appears due to slightly changed semantics of cmd and if_changed_rule. The easy fix was to insert a dummy command first in rule_ksym_ld. The alternative was to redo part of this processing in the top-level Makefile - a volatile area that I try to avoid. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---
2005-07-27kbuild: pass less variables to second make invocation when using make O=...Sam Ravnborg
make exports all variables assigned on the command-line, so no need to pass them explicit. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=4725 Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---
2005-07-27kbuild: KBUILD_VERBOSE was exported twiceSam Ravnborg
This fixes http://bugzilla.kernel.org/show_bug.cgi?id=4727 Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---
2005-07-25kbuild: fix make O=...Sam Ravnborg
kbuild failed to locate Kbuild.include. Teach kbuild how to find Kbuild files when using make O=... Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---
2005-07-25kbuild: introduce Kbuild.includeSam Ravnborg
Kbuild.include is a placeholder for definitions originally present in both the top-level Makefile and scripts/Makefile.build. There were a slight difference in the filechk definition, so the most videly used version was kept and usr/Makefile was adopted for this syntax. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---
2005-07-25kbuild: drop descend - converting existing usersSam Ravnborg
There was only two users left of descend. Fix them so they use $(clean)= and $(build)=. Drop definition of descend. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---
2005-07-25kbuild: drop -Wundef from HOSTCFLAGS for nowSam Ravnborg
-Wundef caused warnings in the bison generated code in kconfig. Updating to a newer bison (1.875d) did not fix it. The alternatives was to correct the autogenerated code or drop -Wundef. For now -Wundef is dropped from HOSTCFLAGS. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---
2005-07-21[PATCH] kbuild: add -Wundef to global CFLAGSOlaf Hering
A recent change to the aic scsi driver removed two defines to detect endianness. cpp handles undefined strings as 0. As a result, the test turned into #if 0 == 0 and the wrong code was selected. Adding -Wundef to global CFLAGS will catch such errors. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-07-17[PATCH] kbuild: When checking depmod version, redirect stderrTom Rini
When running depmod to check for the correct version number, extra output we don't need to see, such as "depmod: QM_MODULES: Function not implemented" may show up. Redirect stderr to /dev/null as the version information that we do care about comes to stdout. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-07-14kbuild: fix make O=... buildSam Ravnborg
It fixes the following error: make[1]: *** No rule to make target `include/asm', needed by `arch/alpha/kernel/asm-offsets.s'. Stop. Reported by: From: Jan Dittmer <j.dittmer@portrix.net> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-07-14kbuild: Don't fail if include/asm symlink existsSam Ravnborg
From: Andreas Gruenbacher <agruen@suse.de> We're having the following situation: There are user-space applications that include kernel headers directly. With a completely unconfigured /usr/src/linux tree, including most headers fails because essential files are not there: include/asm include/linux/autoconf.h include/linux/version.h So we create these files. On the other hand, we want to use /usr/src/linux as read-only source for building kernels or additional modules. Now when building a kernel with a separate output directory (O=), there is a check in the main makefile for the include/asm symlink. There is no real need for this check: if we ensure that $(objdir)/include/asm is always created as the patch does, $(srctree)/include/asm becomes irrelevant. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-07-14kbuild: Add target debug_kallsymsSam Ravnborg
From: Keith Owens <kaos@ocs.com.au> Make it easier to generate maps for debugging kallsyms problems. debug_kallsyms is only a debugging target so no help or silent mode. Signed-off-by: Keith Owens <kaos@ocs.com.au> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-07-13[PATCH] kbuild: allow cscope to index multiple architecturesIan Campbell
I have a single source tree which I cross compile for a couple of different architectures using ARHC=foo O=blah etc. The existing cscope target is very handy but only indexes the current $(ARCH), which is a pain since inevitably I'm interested in the other one at any given time ;-). This patch allows me to pass a list of architectures for cscope to index. e.g. make ALLSOURCE_ARCHS="i386 arm" cscope This change also works for etags etc, and I presume it is just as useful there. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>