summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNg Wei Tee <wei.tee.ng@intel.com>2017-05-04 19:04:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-16 14:08:30 +0100
commitc132ac3d15e8cb60f37f4dc4299ef523c9c257a1 (patch)
treec5d3276da32c35d934aeee5a6738084ac1f07ec1
parent9cf8705ce2965a97a18c3c23ed66f8536c7c1612 (diff)
downloadpoky-c132ac3d15e8cb60f37f4dc4299ef523c9c257a1.tar.gz
linux-firmware: enable netronome firmware
It was previously disabled, as rpm refused to package it into noarch package, due to the firmware being considered arch-specific. This check is disabled in rpm now. The netronome binaries has ELF headers which will trigger an arch-specific error. INSANE_SKIP variable is used to skip some package_qa check usage. (From OE-Core rev: 8b2f6b308019e697c9d3e66969807eb573350d78) Signed-off-by: Ng Wei Tee <wei.tee.ng@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb25
1 files changed, 22 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index be5bdbd7f5..a1b7065041 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -31,6 +31,7 @@ LICENSE = "\
31 & Firmware-Marvell \ 31 & Firmware-Marvell \
32 & Firmware-moxa \ 32 & Firmware-moxa \
33 & Firmware-myri10ge_firmware \ 33 & Firmware-myri10ge_firmware \
34 & Firmware-netronome \
34 & Firmware-nvidia \ 35 & Firmware-nvidia \
35 & Firmware-OLPC \ 36 & Firmware-OLPC \
36 & Firmware-ath9k-htc \ 37 & Firmware-ath9k-htc \
@@ -88,6 +89,7 @@ LIC_FILES_CHKSUM = "\
88 file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ 89 file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \
89 file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ 90 file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \
90 file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ 91 file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \
92 file://LICENCE.Netronome;md5=cd2a3e6effe3cdf42731575b8e9477ed \
91 file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ 93 file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \
92 file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ 94 file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \
93 file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ 95 file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \
@@ -146,6 +148,7 @@ NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth"
146NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" 148NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell"
147NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" 149NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa"
148NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" 150NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware"
151NO_GENERIC_LICENSE[Firmware-netronome] = "LICENCE.Netronome"
149NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" 152NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia"
150NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" 153NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC"
151NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware" 154NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware"
@@ -216,9 +219,6 @@ do_install() {
216 219
217 # Copy the iwlwifi ucode 220 # Copy the iwlwifi ucode
218 cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/ 221 cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/
219
220 # TODO: Remove netronome firmware until RPM packaging issue is resolved
221 rm -r ${D}${nonarch_base_libdir}/firmware/netronome/
222} 222}
223 223
224 224
@@ -246,6 +246,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
246 ${PN}-i915-license ${PN}-i915 \ 246 ${PN}-i915-license ${PN}-i915 \
247 ${PN}-adsp-sst-license ${PN}-adsp-sst \ 247 ${PN}-adsp-sst-license ${PN}-adsp-sst \
248 ${PN}-bnx2-mips \ 248 ${PN}-bnx2-mips \
249 ${PN}-netronome-license ${PN}-netronome \
249 ${PN}-whence-license \ 250 ${PN}-whence-license \
250 ${PN}-license \ 251 ${PN}-license \
251 " 252 "
@@ -371,6 +372,21 @@ RDEPENDS_${PN}-sd8801 += "${PN}-marvell-license"
371RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license" 372RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license"
372RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license" 373RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license"
373 374
375# For netronome
376LICENSE_${PN}-netronome = "Firmware-netronome"
377
378FILES_${PN}-netronome-license = " \
379 ${nonarch_base_libdir}/firmware/LICENCE.Netronome \
380"
381FILES_${PN}-netronome = " \
382 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0081*.nffw \
383 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \
384 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \
385 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0099*.nffw \
386"
387
388RDEPENDS_${PN}-netronome += "${PN}-netronome-license"
389
374# For rtl 390# For rtl
375LICENSE_${PN}-rtl8188 = "Firmware-rtlwifi_firmware" 391LICENSE_${PN}-rtl8188 = "Firmware-rtlwifi_firmware"
376LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware" 392LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware"
@@ -647,3 +663,6 @@ python populate_packages_prepend () {
647 iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) 663 iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs)
648 d.appendVar('RDEPENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) 664 d.appendVar('RDEPENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs))
649} 665}
666
667# Netronome binaries has ELF headers and therefore triggers an arch-specific error.
668INSANE_SKIP_${PN}-netronome = "arch"