On Sat, 2014-09-27 at 19:31 +0100, Ben Hutchings wrote:
> Currently we don't tell modinfo which kernel version to look at
> when checking which firmware files a module may need. It will
> default to the running kernel, not the one we're building the
> initramfs for. So we may not copy all the necessary firmware
> or we may provoke warnings in case a module doesn't exist in
> the running kernel.
I've merged this to master.
Ben.
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
> hook-functions | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hook-functions b/hook-functions
> index 1afb767..020af04 100644
> --- a/hook-functions
> +++ b/hook-functions
> @@ -76,7 +76,7 @@ manual_add_modules()
> fi
>
> # Add required firmware
> - for firmware in $(modinfo -F firmware "${kmod}"); do
> + for firmware in $(modinfo -k "${version}" -F firmware "${kmod}"); do
> if [ -e "${DESTDIR}/lib/firmware/${firmware}" ] \
> || [ -e "${DESTDIR}/lib/firmware/${version}/${firmware}" ]; then
> continue
>
--
Ben Hutchings
The two most common things in the universe are hydrogen and stupidity.
Attachment:
signature.asc
Description: This is a digitally signed message part