| Message ID | 20220423155911.1651860-1-raj.khem@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | wlconf: Use nonarch_base_libdir instead of hardcoding /lib | expand |
Patch applied to master. On 4/23/2022 10:59, Khem Raj wrote: > Helps with usrmerge builds > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb > index 477c5a96..a6f62239 100644 > --- a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb > +++ b/meta-ti-extras/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" > > > > -=-=-=-=-=-=-=-=-=-=-=- > 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: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb index 477c5a96..a6f62239 100644 --- a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb +++ b/meta-ti-extras/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"
Helps with usrmerge builds Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)