Check for existence of files in /lib/modules before running depscan.sh. This replace...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@859 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 28ede4bc3e014ba5f1185923e9e275456905adf8..5982a85c9bbb73e77fcfa6b51994d6907bb7bca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.351 2005/10/10 20:38:03 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.352 2005/10/11 22:12:19 wolf31o2 Exp $
+
+  11 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/post-kmerge.sh:
+  Check for existence of files in /lib/modules before running depscan.sh. This
+  replaces the mips-specific check and makes it portable.
 
   10 Oct 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
index f8397d350cd7fe2cb613cfaee65fd98c6f4a4b02..a21dd750decce654c7c85f9916f5c9d096eb88e6 100755 (executable)
--- a/targets/support/post-kmerge.sh
+++ b/targets/support/post-kmerge.sh
@@ -5,10 +5,17 @@
 /usr/sbin/env-update
 source /etc/profile
 
-case ${clst_mainarch} in
-   mips)   ;;
-   *)
+# Only run depscan.sh if modules exist
+if [ -n "$(ls /lib/modules)" ]
+then
        /sbin/depscan.sh
        find /lib/modules -name modules.dep -exec touch {} \;
-       ;;
-esac
+fi
+
+#case ${clst_mainarch} in
+#   mips)   ;;
+#   *)
+#      /sbin/depscan.sh
+#      find /lib/modules -name modules.dep -exec touch {} \;
+#      ;;
+#esac