Commit 6ac556da authored by Linus Torvalds's avatar Linus Torvalds

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
parents c8354901 8fc62e59
...@@ -21,13 +21,15 @@ fi ...@@ -21,13 +21,15 @@ fi
# older versions of depmod require the version string to start with three # older versions of depmod require the version string to start with three
# numbers, so we cheat with a symlink here # numbers, so we cheat with a symlink here
depmod_hack_needed=true depmod_hack_needed=true
mkdir -p .tmp_depmod/lib/modules/$KERNELRELEASE tmp_dir=$(mktemp -d ${TMPDIR:-/tmp}/depmod.XXXXXX)
if "$DEPMOD" -b .tmp_depmod $KERNELRELEASE 2>/dev/null; then mkdir -p "$tmp_dir/lib/modules/$KERNELRELEASE"
if test -e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep -o \ if "$DEPMOD" -b "$tmp_dir" $KERNELRELEASE 2>/dev/null; then
-e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep.bin; 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 depmod_hack_needed=false
fi fi
fi fi
rm -rf "$tmp_dir"
if $depmod_hack_needed; then if $depmod_hack_needed; then
symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE" symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE"
ln -s "$KERNELRELEASE" "$symlink" ln -s "$KERNELRELEASE" "$symlink"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment