From: Scott Murray <scott.murray@konsulko.com>
Date: Tue, 3 May 2022 18:32:50 +0000 (-0400)
Subject: wlconf: fix behavior with usrmerge
X-Git-Tag: 13.91.0~1
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F38%2F27438%2F1;hp=27785f1c4d0f9de2025a5ba9504651fb651f74d1;p=AGL%2Fmeta-agl-refhw.git

wlconf: fix behavior with usrmerge

The do_install in the wlconf recipe was hard-coding /lib in a few
places instead of using ${nonarch_base_libdir}, which results in
packaging failures when using the usrmerge distro feature, properly
use ${nonarch_base_libdir} where required.

Bug-AGL: SPEC-4352

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I6756e0fbb9f5ff23dda5cd57229283a9c8686d74
---

diff --git a/meta-agl-refhw-gen3/recipes-connectivity/wlconf/wlconf_8.7.3.bb b/meta-agl-refhw-gen3/recipes-connectivity/wlconf/wlconf_8.7.3.bb
index 477c5a9..a6f6223 100644
--- a/meta-agl-refhw-gen3/recipes-connectivity/wlconf/wlconf_8.7.3.bb
+++ b/meta-agl-refhw-gen3/recipes-connectivity/wlconf/wlconf_8.7.3.bb
@@ -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"