diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-16 10:26:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-16 10:26:58 -0700 |
| commit | 7cc2ed05891f424c2e323bc1a368ddb5c78b90f2 (patch) | |
| tree | db628f2dcbb51c0fe9ce15da5897c4ea1404be9f | |
| parent | 8dac6bee32425dd5145b40fa2307648cb7fb4d4a (diff) | |
| parent | 569658dddf276ceb0780776e7f5d61d9f8d8cb88 (diff) | |
| download | kernel_samsung_aries-7cc2ed05891f424c2e323bc1a368ddb5c78b90f2.zip kernel_samsung_aries-7cc2ed05891f424c2e323bc1a368ddb5c78b90f2.tar.gz kernel_samsung_aries-7cc2ed05891f424c2e323bc1a368ddb5c78b90f2.tar.bz2 | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: Call depmod.sh via shell
perf: clear out make flags when calling kernel make kernelver
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | tools/perf/util/PERF-VERSION-GEN | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -1526,7 +1526,8 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) # Run depmod only if we have System.map and depmod is executable quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) - cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE) + cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \ + $(KERNELRELEASE) # Create temporary dir for module support files # clean it up only when building all modules diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 9c5fb4d..ad73300 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -23,7 +23,7 @@ if test -d ../../.git -o -f ../../.git && then VN=$(echo "$VN" | sed -e 's/-/./g'); else - VN=$(make -sC ../.. kernelversion) + VN=$(MAKEFLAGS= make -sC ../.. kernelversion) fi VN=$(expr "$VN" : v*'\(.*\)') |