Patchwork linux-firmware: Package some iwlwifi firmware separately

login
register
mail settings
Submitter Richard Purdie
Date June 24, 2013, 2:27 p.m.
Message ID <1372084023.9930.30.camel@ted>
Download mbox | patch
Permalink /patch/52281/
State Accepted
Commit bb3201b9c21b29604eb06b03e935d53210a7b762
Headers show

Comments

Richard Purdie - June 24, 2013, 2:27 p.m.
Taken from meta-intel, might as well merge this into the core recipe.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Trevor Woerner - June 25, 2013, 8:35 p.m.
On 24 June 2013 10:27, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>  PACKAGES =+ "${PN}-ralink ${PN}-sd8686 ${PN}-wl12xx ${PN}-vt6656 \
>               ${PN}-rtl-license ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su \
>               ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 \
> -             ${PN}-atheros-license ${PN}-ar9170 ${PN}-ar3k ${PN}-ath6k ${PN}-ath9k"
> +             ${PN}-atheros-license ${PN}-ar9170 ${PN}-ar3k ${PN}-ath6k ${PN}-ath9k \
> +             ${PN}-iwlwifi-licence ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6"


Does it matter whether you use "licence" or "license"?
Paul Eggleton - June 28, 2013, 5:58 p.m.
On Tuesday 25 June 2013 16:35:13 Trevor Woerner wrote:
> On 24 June 2013 10:27, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >  PACKAGES =+ "${PN}-ralink ${PN}-sd8686 ${PN}-wl12xx ${PN}-vt6656 \
> >  
> >               ${PN}-rtl-license ${PN}-rtl8192cu ${PN}-rtl8192ce
> >               ${PN}-rtl8192su \
> >               ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330
> >               ${PN}-bcm4334 \
> > 
> > -             ${PN}-atheros-license ${PN}-ar9170 ${PN}-ar3k ${PN}-ath6k
> > ${PN}-ath9k" +             ${PN}-atheros-license ${PN}-ar9170 ${PN}-ar3k
> > ${PN}-ath6k ${PN}-ath9k \ +             ${PN}-iwlwifi-licence
> > ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6"
>
> Does it matter whether you use "licence" or "license"?

For consistency I think it does. I also discovered an incorrect filename at the 
same time as looking into this. I've sent a patch to fix these.

Cheers,
Paul

Patch

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 780cca8..f586321 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -53,10 +53,12 @@  do_install() {
 	( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . )
 }
 
+
 PACKAGES =+ "${PN}-ralink ${PN}-sd8686 ${PN}-wl12xx ${PN}-vt6656 \
              ${PN}-rtl-license ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su \
              ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 \
-             ${PN}-atheros-license ${PN}-ar9170 ${PN}-ar3k ${PN}-ath6k ${PN}-ath9k"
+             ${PN}-atheros-license ${PN}-ar9170 ${PN}-ar3k ${PN}-ath6k ${PN}-ath9k \
+             ${PN}-iwlwifi-licence ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6"
 
 FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware"
 
@@ -168,6 +170,13 @@  RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license"
 ALTERNATIVE_linux-firmware-bcm4334 = "brcmfmac-sdio.bin"
 ALTERNATIVE_TARGET_linux-firmware-bcm4334[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4334.bin"
 
+RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-licence"
+RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-licence"
+
+FILES_${PN}-iwlwifi-licence =   "/lib/firmware/LICENCE.iwlwifi_firmware"
+FILES_${PN}-iwlwifi-6000g2a-5 = "/lib/firmware/iwlwifi-6000g2a-5.ucode"
+FILES_${PN}-iwlwifi-6000g2b-6 = "/lib/firmware/iwlwifi-6000g2b-6.ucode"
+
 FILES_${PN} += "/lib/firmware/*"
 
 # Make linux-firmware depend on all of the split-out packages.