diff options
| author |   Maciej S. Szmigiero <mail@maciej.szmigiero.name> | 2024-03-05 17:24:09 +0300 |
|---|---|---|
| committer |   Ben Kohler <bkohler@gentoo.org> | 2024-05-20 07:58:56 -0500 |
| commit | 64150d2b2993dfc1c6c26bf374e687bfa8f0d686 (patch) | |
| tree | c6a81eabba254f9b8e1edaa39113a8770603af2b | |
| parent | gen_configkernel.sh: use PATH to find depmod (diff) | |
| download | genkernel-64150d2b2993dfc1c6c26bf374e687bfa8f0d686.tar.gz genkernel-64150d2b2993dfc1c6c26bf374e687bfa8f0d686.tar.bz2 genkernel-64150d2b2993dfc1c6c26bf374e687bfa8f0d686.zip | |
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 <mail@maciej.szmigiero.name>
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
| -rwxr-xr-x | gen_moddeps.sh | 7 |
1 files 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 } |