From 64150d2b2993dfc1c6c26bf374e687bfa8f0d686 Mon Sep 17 00:00:00 2001 From: "Maciej S. Szmigiero" Date: Tue, 5 Mar 2024 17:24:09 +0300 Subject: gen_moddeps.sh: always include firmware for built-in modules with ALLFIRMWARE="no" These do not occur in the "modules.dep" file so they won't be caught by the dependency scanning loop in gen_dep_list() - they need to be manually added to the module list. Closes: #54 Signed-off-by: Maciej S. Szmigiero Signed-off-by: Ben Kohler --- gen_moddeps.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gen_moddeps.sh b/gen_moddeps.sh index 070131ce..7e2e0705 100755 --- a/gen_moddeps.sh +++ b/gen_moddeps.sh @@ -62,14 +62,13 @@ gen_dep_list() { rxargs=( "${rxargs[@]/#/-e\/}" ) rxargs=( "${rxargs[@]/%/${KEXT}:}" ) - cat "${moddir}/modules.builtin" \ - | xargs printf '%s:\n' \ - | grep -F "${rxargs[@]}" - cat "${moddir}/modules.dep" \ | grep -F "${rxargs[@]}" ) + # Always include firmware for built-in modules + cat "${moddir}/modules.builtin" + printf '%s\n' "${moddeplist[@]}" fi | xbasename | sort | uniq } -- cgit v1.2.3-65-gdbad