diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-13 14:16:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-13 14:16:53 -0700 |
| commit | 6ac556daa7822fdda585e2c387739abb0646c6ef (patch) | |
| tree | 7d2a1f5b821c5093bea0e161032939693617ed94 /scripts | |
| parent | c835490196c42d9f225ee6873880f436d031df86 (diff) | |
| parent | 8fc62e59425389a6d48429b9d146223122743435 (diff) | |
| download | linux-3.10-6ac556daa7822fdda585e2c387739abb0646c6ef.tar.gz linux-3.10-6ac556daa7822fdda585e2c387739abb0646c6ef.tar.bz2 linux-3.10-6ac556daa7822fdda585e2c387739abb0646c6ef.zip | |
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: Do not write to builddir in modules_install
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/depmod.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/depmod.sh b/scripts/depmod.sh index 3b029cba2ba..a2723568594 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -21,13 +21,15 @@ fi # older versions of depmod require the version string to start with three # numbers, so we cheat with a symlink here depmod_hack_needed=true -mkdir -p .tmp_depmod/lib/modules/$KERNELRELEASE -if "$DEPMOD" -b .tmp_depmod $KERNELRELEASE 2>/dev/null; then - if test -e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep -o \ - -e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep.bin; then +tmp_dir=$(mktemp -d ${TMPDIR:-/tmp}/depmod.XXXXXX) +mkdir -p "$tmp_dir/lib/modules/$KERNELRELEASE" +if "$DEPMOD" -b "$tmp_dir" $KERNELRELEASE 2>/dev/null; then + if test -e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep" -o \ + -e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep.bin"; then depmod_hack_needed=false fi fi +rm -rf "$tmp_dir" if $depmod_hack_needed; then symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE" ln -s "$KERNELRELEASE" "$symlink" |