diff options
| author | Michael Gloff <mgloff@hotmail.com> | 2017-10-25 22:57:45 -0500 |
|---|---|---|
| committer | Paul Barker <pbarker@toganlabs.com> | 2018-04-23 08:49:31 +0000 |
| commit | 2be59f293d61e39de76d9ad9cdab880f45d9a30b (patch) | |
| tree | 3ad3d8ae4fb7eb2ddbc762ba3483d8c6c00ee2b1 | |
| parent | b23820b4c4e0c215d5d3afe9a079add1dd454e6e (diff) | |
| download | meta-raspberrypi-2be59f293d61e39de76d9ad9cdab880f45d9a30b.tar.gz | |
linux-firmware: Replace /lib with ${nonarch_base_libdir}
Use standard /lib variable name and avoid
QA errors when usermerge DISTRO_FEATURE is enabled.
Signed-off-by: Michael Gloff <mgloff@hotmail.com>
| -rw-r--r-- | recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 8 |
1 files 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() { | |||
| 10 | # (v7.45.41.46) | 10 | # (v7.45.41.46) |
| 11 | local _firmware="brcmfmac43430-sdio.bin" | 11 | local _firmware="brcmfmac43430-sdio.bin" |
| 12 | local _oldmd5=9258986488eca9fe5343b0d6fe040f8e | 12 | local _oldmd5=9258986488eca9fe5343b0d6fe040f8e |
| 13 | if [ "$(md5sum ${D}/lib/firmware/brcm/$_firmware | awk '{print $1}')" != "$_oldmd5" ]; then | 13 | if [ "$(md5sum ${D}${nonarch_base_libdir}/firmware/brcm/$_firmware | awk '{print $1}')" != "$_oldmd5" ]; then |
| 14 | _firmware="" | 14 | _firmware="" |
| 15 | bbwarn "linux-firmware stopped providing brcmfmac43430 v7.45.41.26." | 15 | bbwarn "linux-firmware stopped providing brcmfmac43430 v7.45.41.26." |
| 16 | else | 16 | else |
| 17 | _firmware="${WORKDIR}/$_firmware" | 17 | _firmware="${WORKDIR}/$_firmware" |
| 18 | fi | 18 | fi |
| 19 | 19 | ||
| 20 | mkdir -p ${D}/lib/firmware/brcm | 20 | mkdir -p ${D}/${nonarch_base_libdir}/firmware/brcm |
| 21 | install -m 0644 $_firmware ${WORKDIR}/brcmfmac43430-sdio.txt ${D}/lib/firmware/brcm | 21 | install -m 0644 $_firmware ${WORKDIR}/brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | FILES_${PN}-bcm43430 += " \ | 24 | FILES_${PN}-bcm43430 += " \ |
| 25 | /lib/firmware/brcm/brcmfmac43430-sdio.txt \ | 25 | ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \ |
| 26 | " | 26 | " |
