From 3dd3d56d8a1f884310be369c35c42d3b66d7c5c5 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 9 Jun 2011 16:35:41 +0200 Subject: [PATCH] --- yaml --- r: 253359 b: refs/heads/master c: bfe5424a8b31624e7a476f959d552999f931e7c7 h: refs/heads/master i: 253357: 4c281e72b3b04b7f97ed673d1c74d71013defd77 253355: 904d905961691cb8c6a786e0fc2b8c496916691a 253351: e8409343afaed349380754211feed35b9fdaa079 253343: 480688c8dbf53bf0fe4d4f452bfe6ab2eeba0e9e v: v3 --- [refs] | 2 +- trunk/scripts/depmod.sh | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3b24252f35d4..05b8da111bd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc4da9a3e68b1f64237fafda084f61067f568a99 +refs/heads/master: bfe5424a8b31624e7a476f959d552999f931e7c7 diff --git a/trunk/scripts/depmod.sh b/trunk/scripts/depmod.sh index 9f205dafed36..3b029cba2baf 100755 --- a/trunk/scripts/depmod.sh +++ b/trunk/scripts/depmod.sh @@ -18,8 +18,31 @@ fi if ! test -r System.map -a -x "$DEPMOD"; then exit 0 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 + depmod_hack_needed=false + fi +fi +if $depmod_hack_needed; then + symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE" + ln -s "$KERNELRELEASE" "$symlink" + KERNELRELEASE=99.98.$KERNELRELEASE +fi + set -- -ae -F System.map if test -n "$INSTALL_MOD_PATH"; then set -- "$@" -b "$INSTALL_MOD_PATH" fi -exec "$DEPMOD" "$@" "$KERNELRELEASE" +"$DEPMOD" "$@" "$KERNELRELEASE" +ret=$? + +if $depmod_hack_needed; then + rm -f "$symlink" +fi + +exit $ret