diff options
| author | Ming Liu <ming.liu@toradex.com> | 2020-10-12 08:18:19 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-17 19:04:54 +0200 |
| commit | fcbfee275e8531e83b093060e1a403b377090ddb (patch) | |
| tree | 0aec39e2e79b6ff6152d4acc6112e3d87c2cba74 /recipes-bsp | |
| parent | e542346efd956636dd67c8900c40c088111e1b9b (diff) | |
firmware-imx: allow for multilib builds
Using ${nonarch_base_libdir} instead of ${PREFIX}/lib or
${base_libdir}, this ensures it would not mess up multilib builds.
Related-to: TOR-1415
Signed-off-by: Ming Liu <ming.liu@toradex.com>
(cherry picked from commit 2c9c04fb2e7d5c7db6fe88a978189c40841a7c28)
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/firmware-imx/firmware-imx-8_8.5.bbappend | 16 | ||||
| -rw-r--r-- | recipes-bsp/firmware-imx/firmware-imx_8.5.bbappend | 8 |
2 files changed, 11 insertions, 13 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 c100403..1e90037 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.5.bbappend +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.5.bbappend @@ -3,19 +3,17 @@ 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} += " \ - ${PREFIX}/lib/firmware/imx/hdmi/hdmitxfw.bin \ - ${PREFIX}/lib/firmware/imx/hdmi/hdmirxfw.bin \ - ${PREFIX}/lib/firmware/imx/hdmi/dpfw.bin \ + ${nonarch_base_libdir}/firmware/imx/hdmi/hdmitxfw.bin \ + ${nonarch_base_libdir}/firmware/imx/hdmi/hdmirxfw.bin \ + ${nonarch_base_libdir}/firmware/imx/hdmi/dpfw.bin \ " unset do_install[noexec] do_install_append () { - 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/ + install -d ${D}${nonarch_base_libdir}/firmware/imx/hdmi + install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi/ + install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi/ + install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi/ } diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.5.bbappend b/recipes-bsp/firmware-imx/firmware-imx_8.5.bbappend index 5a55881..a1f5ebe 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.5.bbappend +++ b/recipes-bsp/firmware-imx/firmware-imx_8.5.bbappend @@ -6,10 +6,10 @@ SRC_URI[sha256sum] = "5ca1f8b6e6b191594d17ac7b51c38cdbc2ff808d15568ab4b0bbeb5dc6 PACKAGES =+ "${PN}-xcvr ${PN}-xuvi" do_install_append () { - mv ${D}${base_libdir}/firmware/xcvr/ ${D}${base_libdir}/firmware/imx/xcvr/ + mv ${D}${nonarch_base_libdir}/firmware/xcvr/ ${D}${nonarch_base_libdir}/firmware/imx/xcvr/ - mv ${D}${base_libdir}/firmware/xuvi/ ${D}${base_libdir}/firmware/imx/xuvi/ + mv ${D}${nonarch_base_libdir}/firmware/xuvi/ ${D}${nonarch_base_libdir}/firmware/imx/xuvi/ } -FILES_${PN}-xcvr = "${base_libdir}/firmware/imx/xcvr/" -FILES_${PN}-xuvi = "${base_libdir}/firmware/imx/xuvi/" +FILES_${PN}-xcvr = "${nonarch_base_libdir}/firmware/imx/xcvr/" +FILES_${PN}-xuvi = "${nonarch_base_libdir}/firmware/imx/xuvi/" |