From 885485f74c480a73ec1a453901c12dfca30576a9 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Thu, 5 Apr 2012 12:36:58 +0200 Subject: linux-firmware: keep version string in libertas firmware Recent Linux kernel tries to load the libertas firmware with the version string in its name first. This results in a delayed firmware load on system boot. Keep the default libertas firmware name and add a link for older driver versions. (From OE-Core rev: baa1323dfff35ccd5aebc036ca97925a1f1a604e) Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel/linux-firmware') diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 52929fa38b..3675978068 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -38,8 +38,8 @@ do_install() { cp -r * ${D}/lib/firmware/ # Libertas sd8686 - install -m 0644 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin - install -m 0644 libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin + ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin + ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin # Realtek rtl8192* install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt @@ -51,7 +51,11 @@ do_install() { PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx" LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas" -FILES_${PN}-sd8686 = "/lib/firmware/sd8686* /lib/firmware/LICENCE.libertas" +FILES_${PN}-sd8686 = " \ + /lib/firmware/libertas/sd8686_v9* \ + /lib/firmware/sd8686* \ + /lib/firmware/LICENCE.libertas \ +" LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware" FILES_${PN}-rtl8192cu = " \ -- cgit v1.2.3-54-g00ecf