summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Trensch <mtrensch@hilscher.com>2021-03-16 20:26:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-06 22:45:36 +0100
commit0cf8cdb53af9ca646baefec1d3ed61ae4b9bce15 (patch)
treeff01bb9c2cb253edefc5c32e84a0aeda49540ada
parent984009c3d3d557e57f174c35a28a15d8c41fb072 (diff)
downloadpoky-0cf8cdb53af9ca646baefec1d3ed61ae4b9bce15.tar.gz
linux-firmware: Fix packaging
Upstream directory layout has changed after update in commit 3c2f8b750ab9c53773fb5a9a1a874e475740b4ee, resulting in some package to pull in linux-firmware base package. This may cause an image size increase of approximately 700MB. See log.do_packaging: DEBUG: linux-firmware-bcm43340 contains dangling link /lib/firmware/cypress/cyfmac43340-sdio.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm43362 contains dangling link /lib/firmware/cypress/cyfmac43362-sdio.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm4339 contains dangling link /lib/firmware/cypress/cyfmac4339-sdio.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm43430 contains dangling link /lib/firmware/cypress/cyfmac43430-sdio.clm_blob DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm43430 contains dangling link /lib/firmware/cypress/cyfmac43430-sdio.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm43455 contains dangling link /lib/firmware/cypress/cyfmac43455-sdio.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm43455 contains dangling link /lib/firmware/cypress/cyfmac43455-sdio.clm_blob DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm4354 contains dangling link /lib/firmware/cypress/cyfmac4354-sdio.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm4356 contains dangling link /lib/firmware/cypress/cyfmac4356-sdio.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm4356-pcie contains dangling link /lib/firmware/cypress/cyfmac4356-pcie.clm_blob DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm4356-pcie contains dangling link /lib/firmware/cypress/cyfmac4356-pcie.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm43570 contains dangling link /lib/firmware/cypress/cyfmac43570-pcie.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-bcm4373 contains dangling link /lib/firmware/cypress/cyfmac4373-sdio.bin DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0099-0001_2x10.nffw DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0099-0001_2x25.nffw DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0081-0001_4x10.nffw DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0097-0001_8x10.nffw DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0099-0001_1x10_1x25.nffw DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0097-0001_2x40.nffw DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0096-0001_2x10.nffw DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw DEBUG: target found in linux-firmware DEBUG: linux-firmware-netronome contains dangling link /lib/firmware/netronome/nic/nic_AMDA0081-0001_1x40.nffw DEBUG: target found in linux-firmware (From OE-Core rev: 86367fd896a020de7f3379da57f1ec62895bcf70) Signed-off-by: Michael Trensch <mtrensch@hilscher.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit cd273c611b03bd5972da8bf4accaba247f7c9c62) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb41
1 files changed, 32 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb
index 1881a8e065..78856cbf66 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20210208.bb
@@ -496,6 +496,13 @@ FILES_${PN}-netronome = " \
496 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \ 496 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \
497 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \ 497 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \
498 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0099*.nffw \ 498 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0099*.nffw \
499 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0058-0011_2x40.nffw \
500 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0058-0012_2x40.nffw \
501 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0078-0011_1x100.nffw \
502 ${nonarch_base_libdir}/firmware/netronome/bpf \
503 ${nonarch_base_libdir}/firmware/netronome/flower \
504 ${nonarch_base_libdir}/firmware/netronome/nic \
505 ${nonarch_base_libdir}/firmware/netronome/nic-sriov \
499" 506"
500 507
501RDEPENDS_${PN}-netronome += "${PN}-netronome-license" 508RDEPENDS_${PN}-netronome += "${PN}-netronome-license"
@@ -622,7 +629,9 @@ FILES_${PN}-bcm4329 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4329-sdio.bi
622FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*" 629FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*"
623FILES_${PN}-bcm4334 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin" 630FILES_${PN}-bcm4334 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin"
624FILES_${PN}-bcm4335 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4335-sdio.bin" 631FILES_${PN}-bcm4335 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4335-sdio.bin"
625FILES_${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin" 632FILES_${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin \
633 ${nonarch_base_libdir}/firmware/cypress/cyfmac4339-sdio.bin \
634"
626FILES_${PN}-bcm43241b0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b0-sdio.bin" 635FILES_${PN}-bcm43241b0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b0-sdio.bin"
627FILES_${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.bin" 636FILES_${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.bin"
628FILES_${PN}-bcm43241b5 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b5-sdio.bin" 637FILES_${PN}-bcm43241b5 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b5-sdio.bin"
@@ -631,12 +640,18 @@ FILES_${PN}-bcm43143 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43143.bin \
631 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin \ 640 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin \
632" 641"
633FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*" 642FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*"
634FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.*" 643FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.* \
644 ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio.* \
645"
635FILES_${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin" 646FILES_${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin"
636FILES_${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin" 647FILES_${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin"
637FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.bin" 648FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.bin \
649 ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-sdio.bin \
650"
638FILES_${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin" 651FILES_${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin"
639FILES_${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin" 652FILES_${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin \
653 ${nonarch_base_libdir}/firmware/cypress/cyfmac43570-pcie.bin \
654"
640FILES_${PN}-bcm4358 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4358-pcie.bin" 655FILES_${PN}-bcm4358 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4358-pcie.bin"
641FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.bin \ 656FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.bin \
642 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.ap.bin \ 657 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.ap.bin \
@@ -707,13 +722,21 @@ LICENSE_${PN}-cypress-license = "Firmware-cypress"
707FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress" 722FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress"
708 723
709FILES_${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd" 724FILES_${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd"
710FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.*" 725FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.* \
711FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.*" 726 ${nonarch_base_libdir}/firmware/cypress/cyfmac43340-sdio.*"
712FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.*" 727FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.* \
713FILES_${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin" 728 ${nonarch_base_libdir}/firmware/cypress/cyfmac43362-sdio.*"
714FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.*" 729FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.* \
730 ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.*"
731FILES_${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin \
732 ${nonarch_base_libdir}/firmware/cypress/cyfmac4354-sdio.bin \
733"
734FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.* \
735 ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-pcie.* \
736"
715FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ 737FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \
716 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ 738 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \
739 ${nonarch_base_libdir}/firmware/cypress/cyfmac4373-sdio.bin \
717" 740"
718 741
719LICENSE_${PN}-bcm-0bb4-0306 = "Firmware-cypress" 742LICENSE_${PN}-bcm-0bb4-0306 = "Firmware-cypress"