Commit 7cc2ed05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8dac6bee 569658dd

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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

tools/perf/util/PERF-VERSION-GEN

+1 −1
Original line number Diff line number Diff line
@@ -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*'\(.*\)')