modutils-initscripts: Fix modules.dep creation when USE_DEPMOD="0"

When having USE_DEPMOD="0" it is expected that in the first boot that
the modules.dep is generated. To achieve this we need to check if
modules.dep exists and has a size greater than zero. This verification
also needs to be done regardless of whether the /etc/modules or
/etc/modules-load.d directories exist.

Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
index a78adf5729b3add5783af91b12ad0477cfea7ede..3274c25a69013fda2667e1e6a9757d3e27f8da35 100755 (executable)
--- a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
+++ b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
@@ -13,14 +13,16 @@
 
 LOAD_MODULE=modprobe
 [ -f /proc/modules ] || exit 0
-[ -f /etc/modules ] || [ -d /etc/modules-load.d ] || exit 0
-[ -e /sbin/modprobe ] || LOAD_MODULE=insmod
 
-if [ ! -f /lib/modules/`uname -r`/modules.dep ]; then
+# Test if modules.dep exists and has a size greater than zero
+if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then
        [ "$VERBOSE" != no ] && echo "Calculating module dependencies ..."
        depmod -Ae
 fi
 
+[ -f /etc/modules ] || [ -d /etc/modules-load.d ] || exit 0
+[ -e /sbin/modprobe ] || LOAD_MODULE=insmod
+
 loaded_modules=" "
 
 process_file() {