Re: [OE-core] [PATCH v2 1/1] linux-firmware: remove hard-coded paths

[Burton, Ross]

On 31 May 2016 at 06:21, Ian Ray  wrote:

> There was quite a lot of discussion in the v1 patch thread, but
> this patch was revised based on Phil's comments[*] and as such
> it seems like a good first step.
>

Doesn't the kernel itself so the initial firmware search, and if so is that
correctly informed to look somewhere other than /lib?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/1] linux-firmware: remove hard-coded paths

[Ian Ray]

On Fri, Jan 08, 2016 at 09:28:51AM +0200, Ian Ray wrote:
> The recipe uses hard-coded paths (specifically /lib) in do_install
> and in FILES, however on a merged /usr system this directory might
> not exist.  Prefer nonarch_base_libdir.

There were no comments on this?

There was quite a lot of discussion in the v1 patch thread, but
this patch was revised based on Phil's comments[*] and as such
it seems like a good first step.

[*] 
http://lists.openembedded.org/pipermail/openembedded-core/2016-January/114861.html

Thanks,
Ian

> Signed-off-by: Ian Ray 
> ---
>  .../linux-firmware/linux-firmware_git.bb   | 134 
> ++---
>  1 file changed, 67 insertions(+), 67 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb 
> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> index 0878ab1..a61d894 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> @@ -141,24 +141,24 @@ do_compile() {
>  }
>  
>  do_install() {
> - install -d  ${D}/lib/firmware/
> - cp -r * ${D}/lib/firmware/
> + install -d  ${D}${nonarch_base_libdir}/firmware/
> + cp -r * ${D}${nonarch_base_libdir}/firmware/
>  
>   # Avoid Makefile to be deployed
> - rm ${D}/lib/firmware/Makefile
> + rm ${D}${nonarch_base_libdir}/firmware/Makefile
>  
>   # Remove unbuild firmware which needs cmake and bash
> - rm ${D}/lib/firmware/carl9170fw -rf
> + rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf
>  
>   # Remove pointless bash script
> - rm ${D}/lib/firmware/configure
> + rm ${D}${nonarch_base_libdir}/firmware/configure
>  
>   # Libertas sd8686
> - ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
> - ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
> + ln -sf libertas/sd8686_v9.bin 
> ${D}${nonarch_base_libdir}/firmware/sd8686.bin
> + ln -sf libertas/sd8686_v9_helper.bin 
> ${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
>  
>   # fixup wl12xx location, after 2.6.37 the kernel searches a different 
> location for it
> - ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . )
> + ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )
>  }
>  
>  
> @@ -188,21 +188,21 @@ LICENSE_${PN}-ar3k = "Firmware-atheros_firmware"
>  LICENSE_${PN}-ath6k = "Firmware-atheros_firmware"
>  LICENSE_${PN}-ath9k = "Firmware-atheros_firmware"
>  
> -FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware"
> +FILES_${PN}-atheros-license = 
> "${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware"
>  FILES_${PN}-ar9170 = " \
> -  /lib/firmware/ar9170*.fw \
> +  ${nonarch_base_libdir}/firmware/ar9170*.fw \
>  "
>  FILES_${PN}-ar3k = " \
> -  /lib/firmware/ar3k \
> +  ${nonarch_base_libdir}/firmware/ar3k \
>  "
>  FILES_${PN}-ath6k = " \
> -  /lib/firmware/ath6k \
> +  ${nonarch_base_libdir}/firmware/ath6k \
>  "
>  FILES_${PN}-ath9k = " \
> -  /lib/firmware/ar9271.fw \
> -  /lib/firmware/ar7010*.fw \
> -  /lib/firmware/htc_9271.fw \
> -  /lib/firmware/htc_7010.fw \
> +  ${nonarch_base_libdir}/firmware/ar9271.fw \
> +  ${nonarch_base_libdir}/firmware/ar7010*.fw \
> +  ${nonarch_base_libdir}/firmware/htc_9271.fw \
> +  ${nonarch_base_libdir}/firmware/htc_7010.fw \
>  "
>  
>  RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license"
> @@ -213,9 +213,9 @@ RDEPENDS_${PN}-ath9k += "${PN}-atheros-license"
>  # For ralink
>  LICENSE_${PN}-ralink = "Firmware-ralink-firmware"
>  
> -FILES_${PN}-ralink-license = "/lib/firmware/LICENCE.ralink-firmware.txt"
> +FILES_${PN}-ralink-license = 
> "${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt"
>  FILES_${PN}-ralink = " \
> -  /lib/firmware/rt*.bin \
> +  ${nonarch_base_libdir}/firmware/rt*.bin \
>  "
>  
>  RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
> @@ -223,9 +223,9 @@ RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
>  # For radeon
>  LICENSE_${PN}-radeon = "Firmware-radeon"
>  
> -FILES_${PN}-radeon-license = "/lib/firmware/LICENSE.radeon"
> +FILES_${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon"
>  FILES_${PN}-radeon = " \
> -  /lib/firmware/radeon \
> +  ${nonarch_base_libdir}/firmware/radeon \
>  "
>  
>  RDEPENDS_${PN}-radeon += "${PN}-radeon-license"
> @@ -235,16 +235,16 @@ LICENSE_${PN}-sd8686 = "Firmware-Marvell"
>  LICENSE_${PN}-sd8787 = "Firmware-Marvell"
>  LICENSE_${PN}-sd8797 = "Firmware-Marvell"
>  
> -FILES_${PN}-marvell-license = "/lib/firmware/LICENCE.Marvell"
> +FILES_${PN}-marvell-license = 
> "${nonarch_base_libdir}/firmware/LICENCE.Marvell"
>  FILES_${PN}-sd8686 = " \
> -  /lib/firmware/libertas/sd8686_v9* \
> -  /lib/firmware/sd8686* \
> +  ${nonarch_base_libdir}/firmware/libertas/sd8686_v9* \
> +  ${nonarch_base_libdir}/firmware/sd8686* \
>  "
>  FILES_${PN}-sd8787 = " \
> -  /lib/firmware/mrvl/sd8787_uapsta.bin \
> +