linux-firmware fixes
cover linux-firmware fixes
The following changes since commit ff65497cd9a96d5ab49b16ba1f7e30a216ff4a42:
classes/insane: remove la2 check which no longer exists from ERROR_QA (2013-06-28 16:33:05 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/linux-firmware
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/linux-firmware
Paul Eggleton (2):
linux-firmware: be consistent with license package naming
linux-firmware: fix ralink license file name
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/2 linux-firmware: be consistent with license package naming
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.
--- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +4 -4
@@ -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"
Signature · 1 line
1.8.1.2
Re: [PATCH 1/2] linux-firmware: be consistent with license package naming
Quoted 25 lines · Paul Eggleton
Much as I prefer
en_GBspelling, 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 <[email protected]>--- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +1
-1@@ -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"
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" · line 178
Quoted 10 lines
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +3
-3-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.
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 1/2] linux-firmware: be consistent with license package naming
Quoted 50 lines · On Friday 28 June 2013 21:51:00 Martin Jansa wrote:
Quoted 43 lines · Paul Eggleton
Much as I prefer
en_GBspelling, 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 <[email protected]>---
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)(quoted diff) +0
-0b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index f586321..81795f2 100644
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +0
-0@@ -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"meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +3
-3@@ -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"Quoted 1 line
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"
Quoted 3 lines
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
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
PATCH 2/2 linux-firmware: fix ralink license file name
In reply to Paul EggletonLICENCE not LICENSE and -firmware not _firmware. (Upstream seems totally inconsistent with these filenames, unfortunately).
--- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +1 -1
@@ -92,7 +92,7 @@ RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" LICENSE_${PN}-ralink = "Firmware-ralink" FILES_${PN}-ralink = " \ /lib/firmware/rt*.bin \ - /lib/firmware/LICENSE.ralink_firmware.txt \ + /lib/firmware/LICENCE.ralink-firmware.txt \ " LICENSE_${PN}-sd8686 = "Firmware-libertas"
Signature · 1 line
1.8.1.2