From aff7e79046521d4f48aaa4c46093e5d9c099d132 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 23 Apr 2022 08:53:46 -0700 Subject: [PATCH] ti-18xx-wlconf: Use nonarch_base_libdir instead of hardcoding /lib Helps with usrmerge builds Signed-off-by: Khem Raj --- .../ti-18xx-wlconf/ti-18xx-wlconf_8.7.3..bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-connectivity/ti-18xx-wlconf/ti-18xx-wlconf_8.7.3..bb b/recipes-connectivity/ti-18xx-wlconf/ti-18xx-wlconf_8.7.3..bb index ecc48fd..f9d64cf 100644 --- a/recipes-connectivity/ti-18xx-wlconf/ti-18xx-wlconf_8.7.3..bb +++ b/recipes-connectivity/ti-18xx-wlconf/ti-18xx-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"