From bc36f8fd6afcbc4895b6ed0e91aedd240807f756 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 10 Nov 2017 09:41:32 -0800 Subject: 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. Signed-off-by: Saul Wold Signed-off-by: Ross Burton (cherry picked from commit 8b8c40bdbd09ddd1409dc30e04ef847f6a15f109) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'meta/recipes-kernel') 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}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -# Some devices need a specific version, not the latest -SRC_URI += "https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/plain/iwlwifi-8000C-19.ucode;name=iwlwifi-19" - -SRC_URI[iwlwifi-19.md5sum] = "132fbaee36beec5e98714f0bd66f7a1d" -SRC_URI[iwlwifi-19.sha256sum] = "2034470df64d323b827c4f2d4d0d55be2846b7360179b5574aa28ff77b6c9471" - S = "${WORKDIR}/git" inherit allarch @@ -217,9 +211,6 @@ do_install() { # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) - # Copy the iwlwifi ucode - cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/ - # TODO: Remove netronome firmware until RPM packaging issue is resolved rm -r ${D}${nonarch_base_libdir}/firmware/netronome/ } @@ -244,7 +235,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \ ${PN}-iwlwifi-7260 \ ${PN}-iwlwifi-7265 \ - ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ + ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8265 \ ${PN}-iwlwifi-misc \ ${PN}-i915-license ${PN}-i915 \ ${PN}-adsp-sst-license ${PN}-adsp-sst \ @@ -537,7 +528,6 @@ FILES_${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.uco FILES_${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode" FILES_${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode" FILES_${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode" -FILES_${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode" FILES_${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode" FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode" -- cgit 1.2.3-korg