From 919c65ddceb95bef0e959e0ce4df4a2e4e01ed7c Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 12 Dec 2020 17:33:53 +0000 Subject: Identify and include missing firmware for iwlwifi (mga#9541) --- images/NEWS | 2 ++ images/make_boot_img | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'images') diff --git a/images/NEWS b/images/NEWS index db1df11e1..ed8bc48c5 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- identify and include missing firmware for iwlwifi (mga#9541) + Version 2.79 - 4 December 2020 by Thierry Vignaud - sync with kernel 5.10 diff --git a/images/make_boot_img b/images/make_boot_img index 274b03f41..34c521865 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -155,9 +155,13 @@ sub initrd { } $modules="$modules mgakadeploy " if $ENV{BUILD_KA}; + my $extras = `perl ../kernel/modules.pl list_additional_firmware $kernel | xargs`; + chomp $extras; + my $install_extras = $extras ? "--install '$extras'" : ""; + mkdir_p("build/dracut.conf.d"); # TODO if --nofscks and --no-hostonly are switched, dracut gives an error - fix or report upstream - __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary DRAKX_FAKE_MODULES='$fakedrivers' dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' '$img' '$kernel'"; + __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary DRAKX_FAKE_MODULES='$fakedrivers' dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' $install_extras '$img' '$kernel'"; chmod(0644, $img); } -- cgit v1.2.1