From 2b227f8ac09c2767e621db5919e9da5d99e09b31 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 17 Sep 2012 10:32:44 -0400 Subject: silently ignore builtin modules Assuming modules.builtin exists, add the module names it contains to the ADDED_MODULES hash so that we silently skip over them. Suggested-by: Matthew Monaco Signed-off-by: Dave Reisner --- mkinitcpio | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mkinitcpio b/mkinitcpio index 5ea02dd..bdeaa74 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -343,6 +343,13 @@ declare -i builderrors=0 set -o functrace trap '(( $? )) && [[ $FUNCNAME = add_* ]] && (( ++builderrors ))' RETURN +# prime the ADDED_MODULES list with the builtins for this kernel +if [[ -r $MODULEDIR/modules.builtin ]]; then + while read -a path; do + ADDED_MODULES["${path[-1]%.ko}"]=1 + done <"$MODULEDIR/modules.builtin" +fi + for hook in "${hooks[@]}"; do run_build_hook "$hook" || (( ++builderrors )) done -- cgit v1.2.3-24-g4f1b