Skip to contentSkip to conversation

linux-firmware: Package some iwlwifi firmware separately

PATCH In review Richard Purdie 3 participants 3 messages Jun 24, 2013 – Jun 28, 2013

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

PATCH 1/1 linux-firmware: Package some iwlwifi firmware separately

Taken from meta-intel, might as well merge this into the core recipe.

Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +10 -1
index 780cca8..f586321 100644
@@ -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.
#1 lore raw

meta/recipes-kernel/linux-firmware/linux-firmware_git.bb do_install() { · line 61

Quoted 6 lines · Richard Purdie
 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 \
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +2 -1
-             ${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"?

#2 lore raw
Quoted 9 lines · On Tuesday 25 June 2013 16:35:13 Trevor Woerner wrote:
Quoted 7 lines · Richard Purdie

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 \
Quoted 6 lines
Quoted 4 lines

- ${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

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre