aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hjalmarsson <xake@rymdraket.net>2012-10-15 23:30:27 +0200
committerPeter Hjalmarsson <xake@rymdraket.net>2012-10-15 23:39:39 +0200
commitbd6516b779817445be49a9a767f850113ced86c9 (patch)
treec6200483ad5607a35842c4c4356b627d7781cdca
parentMerge branch 'master' into xake (diff)
downloadgenkernel-bd6516b779817445be49a9a767f850113ced86c9.tar.gz
genkernel-bd6516b779817445be49a9a767f850113ced86c9.tar.bz2
genkernel-bd6516b779817445be49a9a767f850113ced86c9.zip
Call depmod after all possible kernel modules has been installedxake
This so we also run it for a possible kerncache Signed-off-by: Peter Hjalmarsson <xake@rymdraket.net>
-rw-r--r--ChangeLog3
-rwxr-xr-xgen_compile.sh7
-rwxr-xr-xgenkernel11
3 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 10680da..0cefed4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
# Distributed under the GPL v2
# $Id$
+ 15 Oct 2012; Peter Hjalmarsson <xake@gentoo.org> gen_compile.sh, genkernel:
+ Call depmod after all possible kernel modules has been installed
+
15 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
Bump to 3.4.44.2 with depmod corner cases by xake.
diff --git a/gen_compile.sh b/gen_compile.sh
index ccc8b8d..5d64d63 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -301,13 +301,6 @@ compile_modules() {
export UNAME_MACHINE="${ARCH}"
[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
MAKEOPTS="${MAKEOPTS} -j1" compile_generic "modules_install" kernel
- print_info 1 " >> Generating module dependency data..."
- if [ "${INSTALL_MOD_PATH}" != '' ]
- then
- depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b "${INSTALL_MOD_PATH}" ${KV}
- else
- depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map ${KV}
- fi
unset UNAME_MACHINE
}
diff --git a/genkernel b/genkernel
index 9c8e45d..533b38e 100755
--- a/genkernel
+++ b/genkernel
@@ -256,6 +256,17 @@ then
gen_kerncache_extract_config
fi
+if [ -d "${INSTALL_MOD_PATH}"/lib/modules/${KV} ]
+then
+ print_info 1 " >> Generating module dependency data..."
+ if [ "${INSTALL_MOD_PATH}" != '' ]
+ then
+ depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b "${INSTALL_MOD_PATH}" ${KV}
+ else
+ depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map ${KV}
+ fi
+fi
+
# Run callback
if [ "${CMD_CALLBACK}" != "" ]
then