summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-04-23 16:40:25 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2013-04-23 16:50:18 (GMT)
commit196a1bd193400dac765df8fd0ff5cde68180ee39 (patch)
treef2f618bf16842d028e9f7e66415eac344b8c235b
parent19740c20016561d691bf1f45e213c45213faafd2 (diff)
downloadmeta-intel-196a1bd193400dac765df8fd0ff5cde68180ee39.tar.gz
linux-firmware: Correct rtl license file location
The rtl-license package FILES was pointing to the wrong directory as it was removed from there in commit: acd3735 linux-firmware: Remove duplicaed license from rtlwifi subdir This resulted in a do_rootfs failure for core-image-sato-sdk for fri2 with ipk when the linux-firmware-dev package tried to install linux-firmware-rtl-license which wasn't created as it was empty. Build tested with ipk and rpm packages. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Acked-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rw-r--r--common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend4
1 files changed, 3 insertions, 1 deletions
diff --git a/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
index 8f324f2..31f991f 100644
--- a/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
+++ b/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
@@ -1,4 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 1}"
2 3
3# This exists in Yocto 1.1, but include it here for completeness 4# This exists in Yocto 1.1, but include it here for completeness
4LIC_FILES_CHKSUM += "file://LICENCE.iwlwifi_firmware;md5=11545778abf78c43d7644d4f171ea1c7" 5LIC_FILES_CHKSUM += "file://LICENCE.iwlwifi_firmware;md5=11545778abf78c43d7644d4f171ea1c7"
@@ -18,6 +19,7 @@ PACKAGES =+ "${PN}-iwlwifi-licence \
18RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-licence" 19RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-licence"
19RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-licence" 20RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-licence"
20 21
21FILES_${PN}-iwlwifi-licence = "${FWPATH}/LICENCE.iwlwifi_firmware" 22FILES_${PN}-iwlwifi-licence = "${FWPATH}/LICENCE.iwlwifi_firmware"
23FILES_${PN}-rtl-license = "${FWPATH}/LICENCE.rtlwifi_firmware.txt"
22FILES_${PN}-iwlwifi-6000g2a-5 = "${FWPATH}/iwlwifi-6000g2a-5.ucode" 24FILES_${PN}-iwlwifi-6000g2a-5 = "${FWPATH}/iwlwifi-6000g2a-5.ucode"
23FILES_${PN}-iwlwifi-6000g2b-6 = "${FWPATH}/iwlwifi-6000g2b-6.ucode" 25FILES_${PN}-iwlwifi-6000g2b-6 = "${FWPATH}/iwlwifi-6000g2b-6.ucode"