summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-05-18 08:08:20 +0200
committerAaron Griffin <aaron@archlinux.org>2006-05-18 08:08:20 +0200
commit5150786ac0f1550eb103bb2250b8012f46308d27 (patch)
tree5ad5405c3f3c4ac04dc319b3e4f9531f4e05cd58
parente804bc8c4f27af5ac32dd1aebf36da846bf853e6 (diff)
downloadmkinitcpio-5150786ac0f1550eb103bb2250b8012f46308d27.tar.gz
mkinitcpio-5150786ac0f1550eb103bb2250b8012f46308d27.tar.xz
Ok, last change to basedir handling for depmod, I swear it!
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@106 880c04e9-e011-0410-abf7-b926e227c9cd
-rw-r--r--mkinitcpio16
1 files changed, 9 insertions, 7 deletions
diff --git a/mkinitcpio b/mkinitcpio
index 26b0a0a..4f77d1b 100644
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -138,14 +138,16 @@ done
if [ "${HAS_MODULES}" == "y" ]; then
echo ":: Generating module dependancies"
- for mod in $(grep "file.*/lib/modules/${KERNELVERSION}" ${FILELIST} | cut -d' ' -f2); do
- mkdir -p "$(dirname "${mod}")"
- cp --parents "${mod}" /tmp
+ for mod in $(grep "file /lib/modules/${KERNELVERSION}" ${FILELIST} | cut -d' ' -f2); do
+ echo "mod=$mod"
+ dir=$(dirname "${mod}")
+ mkdir -p "/tmp/${dir}"
+ cp "${BASEDIR}${mod}" "/tmp/${dir}/"
done
- depmod -b "/tmp/${BASEDIR}" ${KERNELVERSION}
- add_file /tmp/${MODULEDIR}/modules.dep ${MODULEDIR}/modules.dep
- add_file /tmp/${MODULEDIR}/modules.alias ${MODULEDIR}/modules.alias
- add_file /tmp/${MODULEDIR}/modules.symbols ${MODULEDIR}/modules.symbols
+ depmod -b /tmp ${KERNELVERSION}
+ add_file "/tmp/lib/modules/${KERNELVERSION}/modules.dep" "/lib/modules/${KERNELVERSION}/modules.dep"
+ add_file "/tmp/lib/modules/${KERNELVERSION}/modules.alias" "/lib/modules/${KERNELVERSION}/modules.alias"
+ add_file "/tmp/lib/modules/${KERNELVERSION}/modules.symbols" "/lib/modules/${KERNELVERSION}/modules.symbols"
fi
if [ "x$GENIMG" != "x" ]; then