diff options
author | Maciej Pijanowski <maciej.pijanowski@3mdeb.com> | 2017-08-19 12:22:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-04 11:12:11 +0000 |
commit | e0bd661595707169ad4f595d9877b64ba3ab7e75 (patch) | |
tree | edfa2c4b312fb8facd229d2c09a63d2d185c7577 /meta/recipes-kernel/linux-firmware | |
parent | 4f101d4400d297dee2a25dd0a8516f95aff55711 (diff) | |
download | poky-e0bd661595707169ad4f595d9877b64ba3ab7e75.tar.gz |
linux-firmware: package ibt-firmware
ibt-firmware was not packaged separately and was part of big linux-firmware
package. Packaging allows to install it separately, according to requirements.
(From OE-Core rev: 846f72411b85be6d9428c6c0d1e408033a310ac3)
Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f1414d6f9c327547023375f9e298f6f021eaee1b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux-firmware')
-rw-r--r-- | meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 2ba8f03af7..340394dc8a 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | |||
@@ -241,6 +241,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ | |||
241 | ${PN}-iwlwifi-7265 \ | 241 | ${PN}-iwlwifi-7265 \ |
242 | ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8265 \ | 242 | ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8265 \ |
243 | ${PN}-iwlwifi-misc \ | 243 | ${PN}-iwlwifi-misc \ |
244 | ${PN}-ibt-license ${PN}-ibt ${PN}-ibt-misc \ | ||
245 | ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ | ||
244 | ${PN}-i915-license ${PN}-i915 \ | 246 | ${PN}-i915-license ${PN}-i915 \ |
245 | ${PN}-adsp-sst-license ${PN}-adsp-sst \ | 247 | ${PN}-adsp-sst-license ${PN}-adsp-sst \ |
246 | ${PN}-bnx2-mips \ | 248 | ${PN}-bnx2-mips \ |
@@ -618,6 +620,30 @@ RPROVIDES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}- | |||
618 | RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" | 620 | RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" |
619 | RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" | 621 | RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" |
620 | 622 | ||
623 | # For ibt | ||
624 | LICENSE_${PN}-ibt-license = "Firmware-ibt_firmware" | ||
625 | LICENSE_${PN}-ibt-hw-37-7 = "Firmware-ibt_firmware" | ||
626 | LICENSE_${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware" | ||
627 | LICENSE_${PN}-ibt-11-5 = "Firmware-ibt_firmware" | ||
628 | LICENSE_${PN}-ibt-12-16 = "Firmware-ibt_firmware" | ||
629 | LICENSE_${PN}-ibt-misc = "Firmware-ibt_firmware" | ||
630 | |||
631 | FILES_${PN}-ibt-license = "${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware" | ||
632 | FILES_${PN}-ibt-hw-37-7 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bseq" | ||
633 | FILES_${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq" | ||
634 | FILES_${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi /lib/firmware/intel/ibt-11-5.ddc" | ||
635 | FILES_${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi /lib/firmware/intel/ibt-12-16.ddc" | ||
636 | FILES_${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/ibt-*" | ||
637 | |||
638 | RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license" | ||
639 | RDEPENDS_${PN}-ibt-hw-37.8 = "${PN}-ibt-license" | ||
640 | RDEPENDS_${PN}-ibt-11-5 = "${PN}-ibt-license" | ||
641 | RDEPENDS_${PN}-ibt-12-16 = "${PN}-ibt-license" | ||
642 | RDEPENDS_${PN}-ibt-misc = "${PN}-ibt-license" | ||
643 | |||
644 | ALLOW_EMPTY_${PN}-ibt= "1" | ||
645 | ALLOW_EMPTY_${PN}-ibt-misc = "1" | ||
646 | |||
621 | LICENSE_${PN}-i915 = "Firmware-i915" | 647 | LICENSE_${PN}-i915 = "Firmware-i915" |
622 | LICENSE_${PN}-i915-license = "Firmware-i915" | 648 | LICENSE_${PN}-i915-license = "Firmware-i915" |
623 | FILES_${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915" | 649 | FILES_${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915" |
@@ -685,12 +711,16 @@ RDEPENDS_${PN} += "${PN}-whence-license" | |||
685 | 711 | ||
686 | # Make linux-firmware depend on all of the split-out packages. | 712 | # Make linux-firmware depend on all of the split-out packages. |
687 | # Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. | 713 | # Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. |
714 | # Make linux-firmware-ibt depend on all of the split-out ibt packages. | ||
688 | python populate_packages_prepend () { | 715 | python populate_packages_prepend () { |
689 | firmware_pkgs = oe.utils.packages_filter_out_system(d) | 716 | firmware_pkgs = oe.utils.packages_filter_out_system(d) |
690 | d.appendVar('RDEPENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) | 717 | d.appendVar('RDEPENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) |
691 | 718 | ||
692 | iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) | 719 | iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) |
693 | d.appendVar('RDEPENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) | 720 | d.appendVar('RDEPENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) |
721 | |||
722 | ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs) | ||
723 | d.appendVar('RDEPENDS_linux-firmware-ibt', ' ' + ' '.join(ibt_pkgs)) | ||
694 | } | 724 | } |
695 | 725 | ||
696 | # Netronome binaries has ELF headers and therefore triggers an arch-specific error. | 726 | # Netronome binaries has ELF headers and therefore triggers an arch-specific error. |