Bläddra i källkod

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
Linus Torvalds 14 år sedan
förälder
incheckning
7cc2ed0589
2 ändrade filer med 3 tillägg och 2 borttagningar
  1. 2 1
      Makefile
  2. 1 1
      tools/perf/util/PERF-VERSION-GEN

+ 2 - 1
Makefile

@@ -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
 # Run depmod only if we have System.map and depmod is executable
 quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)
 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
 # Create temporary dir for module support files
 # clean it up only when building all modules
 # clean it up only when building all modules

+ 1 - 1
tools/perf/util/PERF-VERSION-GEN

@@ -23,7 +23,7 @@ if test -d ../../.git -o -f ../../.git &&
 then
 then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
 	VN=$(echo "$VN" | sed -e 's/-/./g');
 else
 else
-	VN=$(make -sC ../.. kernelversion)
+	VN=$(MAKEFLAGS= make -sC ../.. kernelversion)
 fi
 fi
 
 
 VN=$(expr "$VN" : v*'\(.*\)')
 VN=$(expr "$VN" : v*'\(.*\)')