Patchwork [2/2] linux-firmware: package Marvell SD8787 firmware

login
register
mail settings
Submitter Peter Bigot
Date Aug. 26, 2013, 9:49 p.m.
Message ID <1377553769-21608-2-git-send-email-pab@pabigot.com>
Download mbox | patch
Permalink /patch/56661/
State Superseded
Headers show

Comments

Peter Bigot - Aug. 26, 2013, 9:49 p.m.
From: "Peter A. Bigot" <pab@pabigot.com>

Also split out Marvell license as separate package.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 .../linux-firmware/linux-firmware_git.bb           |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
Saul Wold - Aug. 29, 2013, 5:42 p.m.
On 08/26/2013 02:49 PM, Peter A. Bigot wrote:
> From: "Peter A. Bigot" <pab@pabigot.com>
>
> Also split out Marvell license as separate package.
>
> Signed-off-by: Peter A. Bigot <pab@pabigot.com>
> ---
>   .../linux-firmware/linux-firmware_git.bb           |   14 ++++++++++++--
>   1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> index 42f6ce0..0c69ee4 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> @@ -55,7 +55,9 @@ do_install() {
>   }
>
>
> -PACKAGES =+ "${PN}-ralink ${PN}-sd8686 ${PN}-wl12xx ${PN}-vt6656 \
> +PACKAGES =+ "${PN}-ralink \
> +             ${PN}-Marvell-license ${PN}-sd8686 ${PN}-sd8787 \
This is an illegal package name with Capital "Marvell", this is due to 
ipkg not handling capital letters in package names.

This should have given you an error during your testing.

Sau!

> +             ${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 \
> @@ -96,12 +98,20 @@ FILES_${PN}-ralink = " \
>     /lib/firmware/LICENCE.ralink-firmware.txt \
>   "
>
> +FILES_${PN}-Marvell-license = "/lib/firmware/LICENCE.Marvell"
> +
>   LICENSE_${PN}-sd8686 = "Firmware-Marvell"
>   FILES_${PN}-sd8686 = " \
>     /lib/firmware/libertas/sd8686_v9* \
>     /lib/firmware/sd8686* \
> -  /lib/firmware/LICENCE.Marvell \
>   "
> +RDEPENDS_${PN}-sd8686 += "${PN}-Marvell-license"
> +
> +LICENSE_${PN}-sd8787 = "Firmware-Marvell"
> +FILES_${PN}-sd8787 = " \
> +  /lib/firmware/mrvl/sd8787_uapsta.bin \
> +"
> +RDEPENDS_${PN}-sd8787 += "${PN}-Marvell-license"
>
>   FILES_${PN}-rtl-license = " \
>     /lib/firmware/LICENCE.rtlwifi_firmware.txt \
>
Peter Bigot - Aug. 29, 2013, 6:23 p.m.
On 08/29/2013 12:42 PM, Saul Wold wrote:
> On 08/26/2013 02:49 PM, Peter A. Bigot wrote:
>> From: "Peter A. Bigot" <pab@pabigot.com>
>>
>> Also split out Marvell license as separate package.
>>
>> Signed-off-by: Peter A. Bigot <pab@pabigot.com>
>> ---
>>   .../linux-firmware/linux-firmware_git.bb           |   14 
>> ++++++++++++--
>>   1 file changed, 12 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb 
>> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>> index 42f6ce0..0c69ee4 100644
>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>> @@ -55,7 +55,9 @@ do_install() {
>>   }
>>
>>
>> -PACKAGES =+ "${PN}-ralink ${PN}-sd8686 ${PN}-wl12xx ${PN}-vt6656 \
>> +PACKAGES =+ "${PN}-ralink \
>> +             ${PN}-Marvell-license ${PN}-sd8686 ${PN}-sd8787 \
> This is an illegal package name with Capital "Marvell", this is due to 
> ipkg not handling capital letters in package names.
>
> This should have given you an error during your testing.

Didn't come up, but I'm using rpm.  I picked capital because that's what 
it is upstream, but will modify it to use lower case and resubmit.

Peter

>
> Sau!
>
>> +             ${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 \
>> @@ -96,12 +98,20 @@ FILES_${PN}-ralink = " \
>>     /lib/firmware/LICENCE.ralink-firmware.txt \
>>   "
>>
>> +FILES_${PN}-Marvell-license = "/lib/firmware/LICENCE.Marvell"
>> +
>>   LICENSE_${PN}-sd8686 = "Firmware-Marvell"
>>   FILES_${PN}-sd8686 = " \
>>     /lib/firmware/libertas/sd8686_v9* \
>>     /lib/firmware/sd8686* \
>> -  /lib/firmware/LICENCE.Marvell \
>>   "
>> +RDEPENDS_${PN}-sd8686 += "${PN}-Marvell-license"
>> +
>> +LICENSE_${PN}-sd8787 = "Firmware-Marvell"
>> +FILES_${PN}-sd8787 = " \
>> +  /lib/firmware/mrvl/sd8787_uapsta.bin \
>> +"
>> +RDEPENDS_${PN}-sd8787 += "${PN}-Marvell-license"
>>
>>   FILES_${PN}-rtl-license = " \
>>     /lib/firmware/LICENCE.rtlwifi_firmware.txt \
>>

Patch

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 42f6ce0..0c69ee4 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -55,7 +55,9 @@  do_install() {
 }
 
 
-PACKAGES =+ "${PN}-ralink ${PN}-sd8686 ${PN}-wl12xx ${PN}-vt6656 \
+PACKAGES =+ "${PN}-ralink \
+             ${PN}-Marvell-license ${PN}-sd8686 ${PN}-sd8787 \
+             ${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 \
@@ -96,12 +98,20 @@  FILES_${PN}-ralink = " \
   /lib/firmware/LICENCE.ralink-firmware.txt \
 "
 
+FILES_${PN}-Marvell-license = "/lib/firmware/LICENCE.Marvell"
+
 LICENSE_${PN}-sd8686 = "Firmware-Marvell"
 FILES_${PN}-sd8686 = " \
   /lib/firmware/libertas/sd8686_v9* \
   /lib/firmware/sd8686* \
-  /lib/firmware/LICENCE.Marvell \
 "
+RDEPENDS_${PN}-sd8686 += "${PN}-Marvell-license"
+
+LICENSE_${PN}-sd8787 = "Firmware-Marvell"
+FILES_${PN}-sd8787 = " \
+  /lib/firmware/mrvl/sd8787_uapsta.bin \
+"
+RDEPENDS_${PN}-sd8787 += "${PN}-Marvell-license"
 
 FILES_${PN}-rtl-license = " \
   /lib/firmware/LICENCE.rtlwifi_firmware.txt \