From f01675db346b5758f583231e3ceb0675fbccfb13 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 3 Dec 2020 11:18:13 +0000 Subject: 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. (From OE-Core rev: 572f3045faa0a937947fbd56bcfef7bad55e9da6) Signed-off-by: Diego Sueiro Signed-off-by: Richard Purdie --- meta/recipes-kernel/modutils-initscripts/files/modutils.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel/modutils-initscripts') diff --git a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh index a78adf5729..3274c25a69 100755 --- 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() { -- cgit v1.2.3-54-g00ecf