Patchwork [1/2] linux-firmware: be consistent with license package naming

login
register
mail settings
Submitter Paul Eggleton
Date June 28, 2013, 5:56 p.m.
Message ID <e50493eabf21983d1c6755c0dfa8552a8e5cfa83.1372442170.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/52623/
State Accepted
Commit f8e4e91de69d5e2f92a122a596d7241546034386
Headers show

Comments

Paul Eggleton - June 28, 2013, 5:56 p.m.
Much as I prefer en_GB spelling, we need to be consistent with the other
package names in this recipe. Thanks to Trevor Woerner for pointing this
out.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Martin Jansa - June 28, 2013, 7:51 p.m.
On Fri, Jun 28, 2013 at 06:56:47PM +0100, Paul Eggleton wrote:
> Much as I prefer en_GB spelling, we need to be consistent with the other
> package names in this recipe. Thanks to Trevor Woerner for pointing this
> out.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> index f586321..81795f2 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> @@ -58,7 +58,7 @@ 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}-iwlwifi-licence ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6"
> +             ${PN}-iwlwifi-license ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6"
>  
>  FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware"
>  
> @@ -170,10 +170,10 @@ 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"
> +RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license"
> +RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license"
>  
> -FILES_${PN}-iwlwifi-licence =   "/lib/firmware/LICENCE.iwlwifi_firmware"
> +FILES_${PN}-iwlwifi-license =   "/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"

FWIW there is also -lic suffix in license.bbclass:
LICENSE_CREATE_PACKAGE ??= "0"
LICENSE_PACKAGE_SUFFIX ??= "-lic"

I don't know if it would cause some collision between package created
here and automatically by license.bbclass, but I guess not as the later
creates only ${PN}-lic.
Paul Eggleton - July 1, 2013, 10:05 a.m.
On Friday 28 June 2013 21:51:00 Martin Jansa wrote:
> On Fri, Jun 28, 2013 at 06:56:47PM +0100, Paul Eggleton wrote:
> > Much as I prefer en_GB spelling, we need to be consistent with the other
> > package names in this recipe. Thanks to Trevor Woerner for pointing this
> > out.
> > 
> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> > ---
> > 
> >  meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> > b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index
> > f586321..81795f2 100644
> > --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> > +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> > @@ -58,7 +58,7 @@ 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}-iwlwifi-licence ${PN}-iwlwifi-6000g2a-5
> > ${PN}-iwlwifi-6000g2b-6" +             ${PN}-iwlwifi-license
> > ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6"> 
> >  FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware"
> > 
> > @@ -170,10 +170,10 @@ 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"
> > +RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license"
> > +RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license"
> > 
> > -FILES_${PN}-iwlwifi-licence =   "/lib/firmware/LICENCE.iwlwifi_firmware"
> > +FILES_${PN}-iwlwifi-license =   "/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"
> 
> FWIW there is also -lic suffix in license.bbclass:
> LICENSE_CREATE_PACKAGE ??= "0"
> LICENSE_PACKAGE_SUFFIX ??= "-lic"
> 
> I don't know if it would cause some collision between package created
> here and automatically by license.bbclass, but I guess not as the later
> creates only ${PN}-lic.

There's even a comment in the recipe itself that this recipe is a bit of a 
mess because of all of the different licenses. I suspect a more automated 
approach for this recipe specifically might be better (although upstream file 
naming makes this a bit more difficult).

For the moment I just wanted to clean up the more obvious issues.

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 f586321..81795f2 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -58,7 +58,7 @@  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}-iwlwifi-licence ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6"
+             ${PN}-iwlwifi-license ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6"
 
 FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware"
 
@@ -170,10 +170,10 @@  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"
+RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license"
+RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license"
 
-FILES_${PN}-iwlwifi-licence =   "/lib/firmware/LICENCE.iwlwifi_firmware"
+FILES_${PN}-iwlwifi-license =   "/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"