diff options
| author | Sergio Prado <sergio.prado@toradex.com> | 2020-09-25 06:32:55 -0300 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-05 17:19:38 +0200 |
| commit | 080c0971037928dbfbba4eef41daf13fa86f80cc (patch) | |
| tree | f5e2f2d9375ac7d079196b8b44f67fd6bd1ab8d3 /recipes-bsp | |
| parent | 96f3866b40b549278d075654f8b4e02b2456a124 (diff) | |
firmware-imx: fix install path when using usrmerge
When using usrmerge, the install path should be prefixed by /usr.
Related-to: TOR-1415
Signed-off-by: Sergio Prado <sergio.prado@toradex.com>
(cherry picked from commit 36228213a2f9b03e8259aa03c196a600364d8130)
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/firmware-imx/firmware-imx-8_8.5.bbappend | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.5.bbappend b/recipes-bsp/firmware-imx/firmware-imx-8_8.5.bbappend index 268671f..c100403 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.5.bbappend +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.5.bbappend @@ -3,17 +3,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" SRC_URI[md5sum] = "eabb27d28bba375a9f14d6306c07af5f" SRC_URI[sha256sum] = "5ca1f8b6e6b191594d17ac7b51c38cdbc2ff808d15568ab4b0bbeb5dc6c621f6" +PREFIX = "${@bb.utils.contains('DISTRO_FEATURES','usrmerge','/usr','',d)}" + FILES_${PN} += " \ - /lib/firmware/imx/hdmi/hdmitxfw.bin \ - /lib/firmware/imx/hdmi/hdmirxfw.bin \ - /lib/firmware/imx/hdmi/dpfw.bin \ + ${PREFIX}/lib/firmware/imx/hdmi/hdmitxfw.bin \ + ${PREFIX}/lib/firmware/imx/hdmi/hdmirxfw.bin \ + ${PREFIX}/lib/firmware/imx/hdmi/dpfw.bin \ " unset do_install[noexec] do_install_append () { - install -d ${D}/lib/firmware/imx/hdmi - install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}/lib/firmware/imx/hdmi/ - install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}/lib/firmware/imx/hdmi/ - install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}/lib/firmware/imx/hdmi/ + install -d ${D}${PREFIX}/lib/firmware/imx/hdmi + install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${PREFIX}/lib/firmware/imx/hdmi/ + install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${PREFIX}/lib/firmware/imx/hdmi/ + install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${PREFIX}/lib/firmware/imx/hdmi/ } |