Skip to content

Commit 6ac556d

Browse files
committed
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
2 parents c835490 + 8fc62e5 commit 6ac556d

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

scripts/depmod.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ fi
2121
# older versions of depmod require the version string to start with three
2222
# numbers, so we cheat with a symlink here
2323
depmod_hack_needed=true
24-
mkdir -p .tmp_depmod/lib/modules/$KERNELRELEASE
25-
if "$DEPMOD" -b .tmp_depmod $KERNELRELEASE 2>/dev/null; then
26-
if test -e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep -o \
27-
-e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep.bin; then
24+
tmp_dir=$(mktemp -d ${TMPDIR:-/tmp}/depmod.XXXXXX)
25+
mkdir -p "$tmp_dir/lib/modules/$KERNELRELEASE"
26+
if "$DEPMOD" -b "$tmp_dir" $KERNELRELEASE 2>/dev/null; then
27+
if test -e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep" -o \
28+
-e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep.bin"; then
2829
depmod_hack_needed=false
2930
fi
3031
fi
32+
rm -rf "$tmp_dir"
3133
if $depmod_hack_needed; then
3234
symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE"
3335
ln -s "$KERNELRELEASE" "$symlink"

0 commit comments

Comments
 (0)