On Wed, Oct 25, 2017 at 6:43 AM, Michael Gloff <[email protected]> wrote: > From: Michael Gloff <[email protected]> > > Use standard variable name and avoid > QA errors when usermerge DISTRO_FEATURE is enabled. > > Signed-off-by: Michael Gloff <[email protected]> > --- > recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend > b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend > index 565b735..daf1dbc 100644 > --- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend > +++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend > @@ -10,17 +10,17 @@ do_install_append() { > # (v7.45.41.46) > local _firmware="brcmfmac43430-sdio.bin" > local _oldmd5=9258986488eca9fe5343b0d6fe040f8e > - if [ "$(md5sum ${D}/lib/firmware/brcm/$_firmware | awk '{print $1}')" > != "$_oldmd5" ]; then > + if [ "$(md5sum ${D}${nonarch_base_libdir}/firmware/brcm/$_firmware | > awk '{print $1}')" != "$_oldmd5" ]; then > _firmware="" > bbwarn "linux-firmware stopped providing brcmfmac43430 > v7.45.41.26." > else > _firmware="${WORKDIR}/$_firmware" > fi > > - mkdir -p ${D}/lib/firmware/brcm > - install -m 0644 $_firmware ${WORKDIR}/brcmfmac43430-sdio.txt > ${D}/lib/firmware/brcm > + mkdir -p ${D}/${nonarch_base_libdir}/firmware/brcm > + install -m 0644 $_firmware ${WORKDIR}/brcmfmac43430-sdio.txt > ${D}${nonarch_base_libdir}/firmware/brcm > } > > FILES_${PN}-bcm43430 += " \ > - /lib/firmware/brcm/brcmfmac43430-sdio.txt \ > + ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \ > " > -- > 2.14.3 >
All 3 patches look good at first glace. Could you submit them as a pull request on https://github.com/agherzan/meta-raspberrypi please? Thanks, -- Paul Barker Togán Labs Ltd -- _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
