| Message ID | 1333622218-5230-1-git-send-email-stefan@herbrechtsmeier.net |
|---|---|
| State | Accepted |
| Commit | baa1323dfff35ccd5aebc036ca97925a1f1a604e |
| Headers | show |
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 52929fa..3675978 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 = " \
On 04/05/2012 03:36 AM, Stefan Herbrechtsmeier wrote: > 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. > > Signed-off-by: Stefan Herbrechtsmeier<stefan@herbrechtsmeier.net> > --- > .../linux-firmware/linux-firmware_git.bb | 10 +++++++--- > 1 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > index 52929fa..3675978 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 = " \ Merged into OE-Core Thanks Sau!
Op 5 apr. 2012 om 20:17 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven: > On 04/05/2012 03:36 AM, Stefan Herbrechtsmeier wrote: >> 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. >> >> Signed-off-by: Stefan Herbrechtsmeier<stefan@herbrechtsmeier.net> >> --- >> .../linux-firmware/linux-firmware_git.bb | 10 +++++++--- >> 1 files changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> index 52929fa..3675978 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 = " \ > > Merged into OE-Core why? It's missing a PR bump. We're close to a release, can we please stop pushing broken commits, especially when a large part of the developers are travelling? > > Thanks > Sau! > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Am 06.04.2012 15:31, schrieb Koen Kooi: > Op 5 apr. 2012 om 20:17 heeft Saul Wold<sgw@linux.intel.com> het volgende geschreven: >> On 04/05/2012 03:36 AM, Stefan Herbrechtsmeier wrote: >>> 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. >>> >>> Signed-off-by: Stefan Herbrechtsmeier<stefan@herbrechtsmeier.net> >>> --- >>> .../linux-firmware/linux-firmware_git.bb | 10 +++++++--- >>> 1 files changed, 7 insertions(+), 3 deletions(-) >>> >>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>> index 52929fa..3675978 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 = " \ >> Merged into OE-Core > why? It's missing a PR bump. We're close to a release, can we please stop pushing broken commits, especially when a large part of the developers are travelling? Should I send an additional patch for the PR bump?
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. Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> --- .../linux-firmware/linux-firmware_git.bb | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)