Skip to contentSkip to conversation

wlconf: Use nonarch_base_libdir instead of hardcoding /lib

PATCH In review Khem Raj 2 participants 2 messages Apr 25, 2022 – Apr 26, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 wlconf: Use nonarch_base_libdir instead of hardcoding /lib

Helps with usrmerge builds

---
 meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb +3 -3
index 477c5a96..a6f62239 100644
@@ -14,14 +14,14 @@ do_install() {
 	install -d ${D}${sbindir}
 	install -d ${D}${sbindir}/wlconf/
 	install -d ${D}${sbindir}/wlconf/official_inis
-	install -d ${D}/lib/firmware/ti-connectivity
+	install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
 
 	install -m 0755 wlconf ${D}${sbindir}/wlconf/
 	install -m 0755 dictionary.txt ${D}${sbindir}/wlconf/
 	install -m 0755 struct.bin ${D}${sbindir}/wlconf/
 	install -m 0755 default.conf ${D}${sbindir}/wlconf/
 	install -m 0755 wl18xx-conf-default.bin ${D}${sbindir}/wlconf/
-	install -m 0755 wl18xx-conf-default.bin ${D}/lib/firmware/ti-connectivity/wl18xx-conf.bin
+	install -m 0755 wl18xx-conf-default.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/wl18xx-conf.bin
 	install -m 0755 README ${D}${sbindir}/wlconf/
 	install -m 0755 example.conf ${D}${sbindir}/wlconf/
 	install -m 0755 example.ini ${D}${sbindir}/wlconf/
@@ -33,7 +33,7 @@ do_install() {
 FILES:${PN} += " \
 	${sbindir}/wlconf \
 	${sbindir}/wlconf/official_inis \
-	/lib/firmware/ti-connectivity/wl18xx-conf.bin \
+	${nonarch_base_libdir}/firmware/ti-connectivity/wl18xx-conf.bin \
 "
 
 FILES:${PN}-dbg += "${sbindir}/wlconf/.debug"
Signature · 1 line
2.36.0
#1 lore raw

Patch applied to master.

Quoted 48 lines · Khem Raj

Helps with usrmerge builds

---
  meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb +3 -4
index 477c5a96..a6f62239 100644
@@ -14,14 +14,14 @@ do_install() {
  	install -d ${D}${sbindir}
  	install -d ${D}${sbindir}/wlconf/
  	install -d ${D}${sbindir}/wlconf/official_inis
-	install -d ${D}/lib/firmware/ti-connectivity
+	install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
 
  	install -m 0755 wlconf ${D}${sbindir}/wlconf/
  	install -m 0755 dictionary.txt ${D}${sbindir}/wlconf/
  	install -m 0755 struct.bin ${D}${sbindir}/wlconf/
  	install -m 0755 default.conf ${D}${sbindir}/wlconf/
  	install -m 0755 wl18xx-conf-default.bin ${D}${sbindir}/wlconf/
-	install -m 0755 wl18xx-conf-default.bin ${D}/lib/firmware/ti-connectivity/wl18xx-conf.bin
+	install -m 0755 wl18xx-conf-default.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/wl18xx-conf.bin
  	install -m 0755 README ${D}${sbindir}/wlconf/
  	install -m 0755 example.conf ${D}${sbindir}/wlconf/
  	install -m 0755 example.ini ${D}${sbindir}/wlconf/
@@ -33,7 +33,7 @@ do_install() {
  FILES:${PN} += " \
  	${sbindir}/wlconf \
  	${sbindir}/wlconf/official_inis \
-	/lib/firmware/ti-connectivity/wl18xx-conf.bin \
+	${nonarch_base_libdir}/firmware/ti-connectivity/wl18xx-conf.bin \
  "
 
  FILES:${PN}-dbg += "${sbindir}/wlconf/.debug"
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#14618): https://lists.yoctoproject.org/g/meta-ti/message/14618
Mute This Topic: https://lists.yoctoproject.org/mt/90650581/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS