[master][PATCH] wl18xx-fw: Make it support usrmerge


Alessio Igor Bogani
 

Signed-off-by: Alessio Igor Bogani <alessio.bogani@...>
---
.../recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
index 48b500a8..09968993 100644
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
+++ b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
@@ -19,7 +19,11 @@ do_compile() {
}

do_install() {
- oe_runmake 'DEST_DIR=${D}' install
+ if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+ oe_runmake 'DEST_DIR=${D}/usr' install
+ else
+ oe_runmake 'DEST_DIR=${D}' install
+ fi
}

-FILES:${PN} = "/lib/firmware/ti-connectivity/*"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
--
2.17.1


Denys Dmytriyenko
 

On Wed, Mar 30, 2022 at 12:45:11PM +0200, Alessio Igor Bogani wrote:
Signed-off-by: Alessio Igor Bogani <alessio.bogani@...>
Reviewed-by: Denys Dmytriyenko <denys@...>


---
.../recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
index 48b500a8..09968993 100644
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
+++ b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
@@ -19,7 +19,11 @@ do_compile() {
}

do_install() {
- oe_runmake 'DEST_DIR=${D}' install
+ if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+ oe_runmake 'DEST_DIR=${D}/usr' install
+ else
+ oe_runmake 'DEST_DIR=${D}' install
+ fi
}

-FILES:${PN} = "/lib/firmware/ti-connectivity/*"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
--
2.17.1


Ryan Eatmon
 

On 4/4/2022 22:54, Denys Dmytriyenko wrote:
On Wed, Mar 30, 2022 at 12:45:11PM +0200, Alessio Igor Bogani wrote:
Signed-off-by: Alessio Igor Bogani <alessio.bogani@...>
Reviewed-by: Denys Dmytriyenko <denys@...>
Signed-off-by: Ryan Eatmon <reatmon@...>

Applied patch to master.


---
.../recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
index 48b500a8..09968993 100644
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
+++ b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
@@ -19,7 +19,11 @@ do_compile() {
}
do_install() {
- oe_runmake 'DEST_DIR=${D}' install
+ if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+ oe_runmake 'DEST_DIR=${D}/usr' install
+ else
+ oe_runmake 'DEST_DIR=${D}' install
+ fi
}
-FILES:${PN} = "/lib/firmware/ti-connectivity/*"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
--
2.17.1


--
Ryan Eatmon reatmon@...
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS