From: Darren Hart <dvhart@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 17/30] linux-firware: use ${base_libdir} instead of /lib for packaging
Date: Mon, 06 Aug 2012 11:10:33 -0700 [thread overview]
Message-ID: <50200899.7000500@linux.intel.com> (raw)
In-Reply-To: <1344182057-15981-18-git-send-email-javier@dowhile0.org>
On 08/05/2012 08:54 AM, Javier Martinez Canillas wrote:
> It is considered good practice to use the build system provided
> variables instead of directly specify hardcoded paths.
The firmware location is explicitly set because this is where the Linux
kernel requires it to be. This patch will break firmware loading.
--
Darren
> Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
> ---
> .../linux-firmware/linux-firmware_git.bb | 34 ++++++++++----------
> 1 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> index a7e4ed6..c5ab173 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> @@ -35,50 +35,50 @@ do_compile() {
> }
>
> do_install() {
> - install -d ${D}/lib/firmware/
> - cp -r * ${D}/lib/firmware/
> + install -d ${D}${base_libdir}/firmware/
> + cp -r * ${D}${base_libdir}/firmware/
>
> # 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}${base_libdir}/firmware/sd8686.bin
> + ln -sf libertas/sd8686_v9_helper.bin ${D}${base_libdir}/firmware/sd8686_helper.bin
>
> # Realtek rtl8192*
> - install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
> + install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}${base_libdir}/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
>
> # 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}${base_libdir}/firmware ; ln -sf ti-connectivity/* . )
> }
>
> PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx"
>
> LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas"
> FILES_${PN}-sd8686 = " \
> - /lib/firmware/libertas/sd8686_v9* \
> - /lib/firmware/sd8686* \
> - /lib/firmware/LICENCE.libertas \
> + ${base_libdir}/firmware/libertas/sd8686_v9* \
> + ${base_libdir}/firmware/sd8686* \
> + ${base_libdir}/firmware/LICENCE.libertas \
> "
>
> LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware"
> FILES_${PN}-rtl8192cu = " \
> - /lib/firmware/rtlwifi/rtl8192cufw.bin \
> - /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
> + ${base_libdir}/firmware/rtlwifi/rtl8192cufw.bin \
> + ${base_libdir}/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
> "
>
> LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware"
> FILES_${PN}-rtl8192ce = " \
> - /lib/firmware/rtlwifi/rtl8192cfw.bin \
> + ${base_libdir}/firmware/rtlwifi/rtl8192cfw.bin \
> "
>
> LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware"
> FILES_${PN}-rtl8192su = " \
> - /lib/firmware/rtlwifi/rtl8712u.bin \
> + ${base_libdir}/firmware/rtlwifi/rtl8712u.bin \
> "
>
> FILES_${PN}-wl12xx = " \
> - /lib/firmware/wl12* \
> - /lib/firmware/TI* \
> - /lib/firmware/ti-connectivity \
> + ${base_libdir}/firmware/wl12* \
> + ${base_libdir}/firmware/TI* \
> + ${base_libdir}/firmware/ti-connectivity \
> "
>
> -FILES_${PN} += "/lib/firmware/*"
> +FILES_${PN} += "${base_libdir}/firmware/*"
>
>
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel
next prev parent reply other threads:[~2012-08-06 18:24 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-05 15:53 [PATCH 00/30] cleanup: use variables instead of hardcoded paths Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 01/30] xinetd: use ${sbindir} instead of /usr/sbin for packaging Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 02/30] alsa-state: " Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 03/30] lsbsetup: use ${bindir} instead of /usr/bin " Javier Martinez Canillas
2012-08-06 17:25 ` Mark Hatle
2012-08-05 15:53 ` [PATCH 04/30] sudo: use ${bindir} and ${sysconfdir} instead of /usr/bin and /etc Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 05/30] lsbtest: use ${bindir} instead of /usr/bin for packaging Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 06/30] cronie: use variables instead of hardcoded paths Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 07/30] useradd-example: use ${datadir} instead of /usr/share for packaging Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 08/30] ubootchart: use variables instead of hardcoded paths Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 09/30] xkeyboard-config: use ${datadir} instead of /usr/share for packaging Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 10/30] systemtap: " Javier Martinez Canillas
2012-08-05 15:53 ` [PATCH 11/30] lsb: use ${base_bindir} instead of /bin " Javier Martinez Canillas
2012-08-06 17:29 ` Mark Hatle
2012-08-05 15:53 ` [PATCH 12/30] mingetty: use ${base_sbindir} instead of /sbin " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 13/30] external-sourcery: use ${prefix} and ${libdir} instead of /usr and /usr/lib Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 14/30] rpm: use ${localstatedir} and ${libdir} instead of /var " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 15/30] at: use ${base_sbindir} instead of /sbin for packaging Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 16/30] kernel.bbclass: use ${base_libdir} and ${sysconfdir} instead of /lib and /etc Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 17/30] linux-firware: use ${base_libdir} instead of /lib for packaging Javier Martinez Canillas
2012-08-06 18:10 ` Darren Hart [this message]
2012-08-06 18:21 ` Phil Blundell
2012-08-07 16:14 ` Darren Hart
2012-08-07 18:29 ` Koen Kooi
2012-08-05 15:54 ` [PATCH 18/30] openssh: use ${localstatedir} instead of /var " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 19/30] libpam: use ${localstatedir} and ${sysconfdir} instead of /var and /etc Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 20/30] x11-common: use ${sysconfdir} instead of /etc for packaging Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 21/30] lsb: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 22/30] builder: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 23/30] xserver-nodm-init: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 24/30] lsbinitscripts: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 25/30] xinetd: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 26/30] usbinit: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 27/30] qemu-config: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 28/30] rsync: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 29/30] chkconfig: " Javier Martinez Canillas
2012-08-05 15:54 ` [PATCH 30/30] man: " Javier Martinez Canillas
2012-08-05 18:16 ` [PATCH 00/30] cleanup: use variables instead of hardcoded paths Otavio Salvador
2012-08-05 19:10 ` Khem Raj
2012-08-05 19:19 ` Javier Martinez Canillas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50200899.7000500@linux.intel.com \
--to=dvhart@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox