diff options
author | Saul Wold <sgw@linux.intel.com> | 2017-11-10 09:41:32 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-04 11:12:11 +0000 |
commit | 3da3796133c2ebc1463b1fda9c73283e6b8460fe (patch) | |
tree | afb3fcd9fa9fe7bb60ef211351c213e842cfa075 /meta/recipes-kernel/linux-firmware | |
parent | b1d990ab4ceee1eda275855d20f96fa1872cf4ba (diff) | |
download | poky-3da3796133c2ebc1463b1fda9c73283e6b8460fe.tar.gz |
linux-firmware: Remove iwlwifi-8000C-19 SRC_URI
Since it's been removed from the upstream repo and not fetchable
remove it here. The newer firmware supports the device correctly.
(From OE-Core rev: c134c583e0ef315e88644d94e5a3920b92c6f39d)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 8b8c40bdbd09ddd1409dc30e04ef847f6a15f109)
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 | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 7abb378709..c17afc9e47 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | |||
@@ -178,12 +178,6 @@ PV = "0.0+git${SRCPV}" | |||
178 | 178 | ||
179 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" | 179 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" |
180 | 180 | ||
181 | # Some devices need a specific version, not the latest | ||
182 | SRC_URI += "https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/plain/iwlwifi-8000C-19.ucode;name=iwlwifi-19" | ||
183 | |||
184 | SRC_URI[iwlwifi-19.md5sum] = "132fbaee36beec5e98714f0bd66f7a1d" | ||
185 | SRC_URI[iwlwifi-19.sha256sum] = "2034470df64d323b827c4f2d4d0d55be2846b7360179b5574aa28ff77b6c9471" | ||
186 | |||
187 | S = "${WORKDIR}/git" | 181 | S = "${WORKDIR}/git" |
188 | 182 | ||
189 | inherit allarch | 183 | inherit allarch |
@@ -217,9 +211,6 @@ do_install() { | |||
217 | # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it | 211 | # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it |
218 | ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) | 212 | ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) |
219 | 213 | ||
220 | # Copy the iwlwifi ucode | ||
221 | cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/ | ||
222 | |||
223 | # TODO: Remove netronome firmware until RPM packaging issue is resolved | 214 | # TODO: Remove netronome firmware until RPM packaging issue is resolved |
224 | rm -r ${D}${nonarch_base_libdir}/firmware/netronome/ | 215 | rm -r ${D}${nonarch_base_libdir}/firmware/netronome/ |
225 | } | 216 | } |
@@ -244,7 +235,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ | |||
244 | ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \ | 235 | ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \ |
245 | ${PN}-iwlwifi-7260 \ | 236 | ${PN}-iwlwifi-7260 \ |
246 | ${PN}-iwlwifi-7265 \ | 237 | ${PN}-iwlwifi-7265 \ |
247 | ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ | 238 | ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8265 \ |
248 | ${PN}-iwlwifi-misc \ | 239 | ${PN}-iwlwifi-misc \ |
249 | ${PN}-i915-license ${PN}-i915 \ | 240 | ${PN}-i915-license ${PN}-i915 \ |
250 | ${PN}-adsp-sst-license ${PN}-adsp-sst \ | 241 | ${PN}-adsp-sst-license ${PN}-adsp-sst \ |
@@ -537,7 +528,6 @@ FILES_${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.uco | |||
537 | FILES_${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode" | 528 | FILES_${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode" |
538 | FILES_${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode" | 529 | FILES_${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode" |
539 | FILES_${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode" | 530 | FILES_${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode" |
540 | FILES_${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode" | ||
541 | FILES_${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode" | 531 | FILES_${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode" |
542 | FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode" | 532 | FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode" |
543 | 533 | ||