linux-firmware: Replace /lib with ${nonarch_base_libdir}
PATCH 1/3 linux-firmware: Replace /lib with ${nonarch_base_libdir}
From: Michael Gloff <[email protected]>
Use standard variable name and avoid
QA errors when usermerge DISTRO_FEATURE is enabled.
--- recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-kernel/linux-firmware/linux-firmware_%.bbappend +4 -4
@@ -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 \ "
Signature · 1 line
2.14.3
PATCH 2/3 linux-raspberrypi: Replace /lib with ${nonarch_base_libdir}
From: Michael Gloff <[email protected]>
Use standard variable name and avoid
QA errors when usermerge DISTRO_FEATURE is enabled.
--- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/linux-raspberrypi.inc +1 -1
@@ -162,7 +162,7 @@ do_compile_append_raspberrypi3-64() { } do_install_prepend() { - install -d ${D}/lib/firmware + install -d ${D}${nonarch_base_libdir}/firmware } do_deploy_append() {
Signature · 1 line
2.14.3
PATCH 3/3 bluez5: Replace /lib with ${nonarch_base_libdir}
In reply to Michael GloffFrom: Michael Gloff <[email protected]>
Use standard variable name and avoid
QA errors when usermerge DISTRO_FEATURE is enabled.
--- recipes-connectivity/bluez5/bluez5_%.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-connectivity/bluez5/bluez5_%.bbappend +3 -3
@@ -10,8 +10,8 @@ BCM_BT_SOURCES = " \ " enable_bcm_bluetooth() { - install -d ${D}/lib/firmware/brcm/ - install -m 0644 ${WORKDIR}/BCM43430A1.hcd ${D}/lib/firmware/brcm/BCM43430A1.hcd + install -d ${D}${nonarch_base_libdir}/firmware/brcm/ + install -m 0644 ${WORKDIR}/BCM43430A1.hcd ${D}${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system
@@ -20,7 +20,7 @@ enable_bcm_bluetooth() { } BCM_BT_FIRMWARE = " \ - /lib/firmware/brcm/BCM43430A1.hcd \ + ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \ " BCM_BT_SERVICE = " brcm43438.service"
Signature · 1 line
2.14.3
Quoted 37 lines · Michael Gloff
From: Michael Gloff <[email protected]>
Use standard variable name and avoid
QA errors when usermergeDISTRO_FEATUREis enabled.Signed-off-by Michael Gloff <[email protected]>--- recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)recipes-kernel/linux-firmware/linux-firmware_%.bbappend +4
-5@@ -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 \ " --
Quoted 2 lines
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,
Signature · 2 lines
Paul Barker Togán Labs Ltd
The entire patch set was merged to master. Thanks.
Quoted 49 lines · Michael Gloff
From: Michael Gloff <[email protected]>
Use standard variable name and avoid
QA errors when usermergeDISTRO_FEATUREis enabled.Signed-off-by Michael Gloff <[email protected]>---
recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)recipes-kernel/linux-firmware/linux-firmware_%.bbappend +0
-1@@ -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
recipes-kernel/linux-firmware/linux-firmware_%.bbappend +1
-0+ 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" firecipes-kernel/linux-firmware/linux-firmware_%.bbappend +0
-2- mkdir -p ${D}/lib/firmware/brcm - install -m 0644 $_firmware ${WORKDIR}/brcmfmac43430-sdio.txt${D}/lib/firmware/brcm
recipes-kernel/linux-firmware/linux-firmware_%.bbappend +2
-0+ 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 += " \
recipes-kernel/linux-firmware/linux-firmware_%.bbappend +1
-1- /lib/firmware/brcm/brcmfmac43430-sdio.txt \ + ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \"
Signature · 7 lines
2.14.3 -- _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
Signature · 2 lines
Andrei Gherzan gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan