wlconf: fix behavior with usrmerge

[AGL/meta-agl-refhw.git] / meta-agl-refhw-gen3 / recipes-connectivity / wlconf / wlconf_8.7.3.bb

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 42a3248..a6f6223 100644 (file)
--- 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
@@ -1,10 +1,10 @@
 DESCRIPTION = "Configuration utility for TI wireless drivers"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85c90328e3a9438"
 
 # Tag: R8.7_SP3 (8.7.3)
 SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2"
-SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git"
+SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git;branch=master"
 
 S = "${WORKDIR}/git/wlconf"
 
@@ -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/
@@ -30,10 +30,10 @@ do_install() {
                        ${D}${sbindir}/wlconf/official_inis/
 }
 
-FILES_${PN} += " \
+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"
\ No newline at end of file
+FILES:${PN}-dbg += "${sbindir}/wlconf/.debug"