[meta-intel] [PATCH] linux-firmware: Correct rtl license file location
Tom Zanussi
tom.zanussi at intel.com
Tue Apr 23 09:43:46 PDT 2013
On Tue, 2013-04-23 at 09:42 -0700, Darren Hart wrote:
> 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.
>
> Applies to dylan and master.
>
> Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Acked-by: Tom Zanussi <tom.zanussi at linux.intel.com>
> ---
> .../linux-firmware/linux-firmware_git.bbappend | 4 +++-
> 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 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +PRINC := "${@int(PRINC) + 1}"
>
> # This exists in Yocto 1.1, but include it here for completeness
> LIC_FILES_CHKSUM += "file://LICENCE.iwlwifi_firmware;md5=11545778abf78c43d7644d4f171ea1c7"
> @@ -18,6 +19,7 @@ PACKAGES =+ "${PN}-iwlwifi-licence \
> RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-licence"
> RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-licence"
>
> -FILES_${PN}-iwlwifi-licence = "${FWPATH}/LICENCE.iwlwifi_firmware"
> +FILES_${PN}-iwlwifi-licence = "${FWPATH}/LICENCE.iwlwifi_firmware"
> +FILES_${PN}-rtl-license = "${FWPATH}/LICENCE.rtlwifi_firmware.txt"
> FILES_${PN}-iwlwifi-6000g2a-5 = "${FWPATH}/iwlwifi-6000g2a-5.ucode"
> FILES_${PN}-iwlwifi-6000g2b-6 = "${FWPATH}/iwlwifi-6000g2b-6.ucode"
More information about the meta-intel
mailing list