All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-raspberrypi][PATCH 1/3] linux-firmware: Replace /lib with ${nonarch_base_libdir}
@ 2017-10-25  5:43 Michael Gloff
  2017-10-25  5:43 ` [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: " Michael Gloff
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Michael Gloff @ 2017-10-25  5:43 UTC (permalink / raw)
  To: yocto; +Cc: Michael Gloff

From: Michael Gloff <mgloff@hotmail.com>

	Use standard variable name and avoid
	QA errors when usermerge DISTRO_FEATURE is enabled.

Signed-off-by: Michael Gloff <mgloff@emacinc.com>
---
 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



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: Replace /lib with ${nonarch_base_libdir}
  2017-10-25  5:43 [meta-raspberrypi][PATCH 1/3] linux-firmware: Replace /lib with ${nonarch_base_libdir} Michael Gloff
@ 2017-10-25  5:43 ` Michael Gloff
  2017-10-25  5:43 ` [meta-raspberrypi][PATCH 3/3] bluez5: " Michael Gloff
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Michael Gloff @ 2017-10-25  5:43 UTC (permalink / raw)
  To: yocto; +Cc: Michael Gloff

From: Michael Gloff <mgloff@hotmail.com>

    Use standard variable name and avoid
    QA errors when usermerge DISTRO_FEATURE is enabled.

Signed-off-by: Michael Gloff <mgloff@emacinc.com>
---
 recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index da36ca7..cf9f182 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -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() {
-- 
2.14.3



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [meta-raspberrypi][PATCH 3/3] bluez5: Replace /lib with ${nonarch_base_libdir}
  2017-10-25  5:43 [meta-raspberrypi][PATCH 1/3] linux-firmware: Replace /lib with ${nonarch_base_libdir} Michael Gloff
  2017-10-25  5:43 ` [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: " Michael Gloff
@ 2017-10-25  5:43 ` Michael Gloff
  2017-10-25  8:43 ` [meta-raspberrypi][PATCH 1/3] linux-firmware: " Paul Barker
  2017-10-27 20:42 ` Andrei Gherzan
  3 siblings, 0 replies; 5+ messages in thread
From: Michael Gloff @ 2017-10-25  5:43 UTC (permalink / raw)
  To: yocto; +Cc: Michael Gloff

From: Michael Gloff <mgloff@hotmail.com>

    Use standard variable name and avoid
    QA errors when usermerge DISTRO_FEATURE is enabled.

Signed-off-by: Michael Gloff <mgloff@emacinc.com>
---
 recipes-connectivity/bluez5/bluez5_%.bbappend | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-connectivity/bluez5/bluez5_%.bbappend b/recipes-connectivity/bluez5/bluez5_%.bbappend
index 03efd5c..eac8d40 100644
--- a/recipes-connectivity/bluez5/bluez5_%.bbappend
+++ b/recipes-connectivity/bluez5/bluez5_%.bbappend
@@ -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"
-- 
2.14.3



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [meta-raspberrypi][PATCH 1/3] linux-firmware: Replace /lib with ${nonarch_base_libdir}
  2017-10-25  5:43 [meta-raspberrypi][PATCH 1/3] linux-firmware: Replace /lib with ${nonarch_base_libdir} Michael Gloff
  2017-10-25  5:43 ` [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: " Michael Gloff
  2017-10-25  5:43 ` [meta-raspberrypi][PATCH 3/3] bluez5: " Michael Gloff
@ 2017-10-25  8:43 ` Paul Barker
  2017-10-27 20:42 ` Andrei Gherzan
  3 siblings, 0 replies; 5+ messages in thread
From: Paul Barker @ 2017-10-25  8:43 UTC (permalink / raw)
  To: Michael Gloff; +Cc: Michael Gloff, yocto

On Wed, Oct 25, 2017 at 6:43 AM, Michael Gloff <mgloff@emacinc.com> wrote:
> From: Michael Gloff <mgloff@hotmail.com>
>
>         Use standard variable name and avoid
>         QA errors when usermerge DISTRO_FEATURE is enabled.
>
> Signed-off-by: Michael Gloff <mgloff@emacinc.com>
> ---
>  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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [meta-raspberrypi][PATCH 1/3] linux-firmware: Replace /lib with ${nonarch_base_libdir}
  2017-10-25  5:43 [meta-raspberrypi][PATCH 1/3] linux-firmware: Replace /lib with ${nonarch_base_libdir} Michael Gloff
                   ` (2 preceding siblings ...)
  2017-10-25  8:43 ` [meta-raspberrypi][PATCH 1/3] linux-firmware: " Paul Barker
@ 2017-10-27 20:42 ` Andrei Gherzan
  3 siblings, 0 replies; 5+ messages in thread
From: Andrei Gherzan @ 2017-10-27 20:42 UTC (permalink / raw)
  To: yocto, Michael Gloff; +Cc: Michael Gloff


[-- Attachment #1.1: Type: text/plain, Size: 1960 bytes --]

The entire patch set was merged to master. Thanks. 

On 25 October 2017 06:43:28 BST, Michael Gloff <mgloff@emacinc.com> wrote:
>From: Michael Gloff <mgloff@hotmail.com>
>
>	Use standard variable name and avoid
>	QA errors when usermerge DISTRO_FEATURE is enabled.
>
>Signed-off-by: Michael Gloff <mgloff@emacinc.com>
>---
> 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
>
>-- 
>_______________________________________________
>yocto mailing list
>yocto@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/yocto

-- 
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan

[-- Attachment #1.2: Type: text/html, Size: 2310 bytes --]

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 871 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-10-27 20:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-25  5:43 [meta-raspberrypi][PATCH 1/3] linux-firmware: Replace /lib with ${nonarch_base_libdir} Michael Gloff
2017-10-25  5:43 ` [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: " Michael Gloff
2017-10-25  5:43 ` [meta-raspberrypi][PATCH 3/3] bluez5: " Michael Gloff
2017-10-25  8:43 ` [meta-raspberrypi][PATCH 1/3] linux-firmware: " Paul Barker
2017-10-27 20:42 ` Andrei Gherzan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.