From 85a97582de6343eda3d31af83856575346393a6f Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 17 Dec 2017 19:12:59 +0000 Subject: [PATCH] buildsystem: get_module_dir() is expensive, optimize --- config/functions | 6 +++++- scripts/image | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/functions b/config/functions index 6bfa4a861c..f308f3c9c0 100644 --- a/config/functions +++ b/config/functions @@ -189,7 +189,11 @@ kernel_version() { # get kernel module dir get_module_dir() { - basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/kernel-overlays/base/lib/modules/*) + if [ -n "${_CACHED_KERNEL_MODULE_DIR}" ]; then + echo "${_CACHED_KERNEL_MODULE_DIR}" + else + basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/kernel-overlays/base/lib/modules/*) + fi } # get base path to kernel modules and firmware diff --git a/scripts/image b/scripts/image index 10f2252d74..9d0ccc9517 100755 --- a/scripts/image +++ b/scripts/image @@ -149,7 +149,10 @@ ln -sf /etc/issue $INSTALL/etc/motd # Basissystem... $SCRIPTS/install libc $SCRIPTS/install gcc + $SCRIPTS/install linux +export _CACHED_KERNEL_MODULE_DIR="$(get_module_dir)" + $SCRIPTS/install linux-drivers $SCRIPTS/install linux-firmware $SCRIPTS/install $BOOTLOADER