* [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend
@ 2020-09-17 9:58 Nathan.Dunne
2020-09-17 10:05 ` Diego Sueiro
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Nathan.Dunne @ 2020-09-17 9:58 UTC (permalink / raw)
To: meta-arm; +Cc: nd, Nathan Dunne
Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent
it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files
Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
Issue-Id: SCM-1302
Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
---
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
index bf57242..5fc3723 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,7 +1,7 @@
# Machine specific u-boot
-THISDIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
+THIS_DIR := "${THISDIR}"
+FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend
2020-09-17 9:58 [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend Nathan.Dunne
@ 2020-09-17 10:05 ` Diego Sueiro
2020-09-17 16:44 ` [meta-arm] " Denys Dmytriyenko
2020-09-21 16:38 ` [meta-arm] " Jon Mason
2 siblings, 0 replies; 5+ messages in thread
From: Diego Sueiro @ 2020-09-17 10:05 UTC (permalink / raw)
To: meta-arm
On Thu, Sep 17, 2020 at 10:59 AM, Nathan Dunne wrote:
>
> Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent
> it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files
>
> Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
> Issue-Id: SCM-1302
> Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
> ---
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
> meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> index bf57242..5fc3723 100644
> --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> @@ -1,7 +1,7 @@
> # Machine specific u-boot
>
> -THISDIR := "${THISDIR}"
> -FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
> +THIS_DIR := "${THISDIR}"
> +FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
> FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
> FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
>
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [meta-arm] [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend
2020-09-17 9:58 [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend Nathan.Dunne
2020-09-17 10:05 ` Diego Sueiro
@ 2020-09-17 16:44 ` Denys Dmytriyenko
2020-09-18 8:24 ` Nathan Dunne
2020-09-21 16:38 ` [meta-arm] " Jon Mason
2 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2020-09-17 16:44 UTC (permalink / raw)
To: Nathan Dunne; +Cc: meta-arm, nd
On Thu, Sep 17, 2020 at 09:58:17AM +0000, Nathan Dunne wrote:
> Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent
> it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files
>
> Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
> Issue-Id: SCM-1302
> Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
> ---
> meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> index bf57242..5fc3723 100644
> --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> @@ -1,7 +1,7 @@
> # Machine specific u-boot
>
> -THISDIR := "${THISDIR}"
> -FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
> +THIS_DIR := "${THISDIR}"
> +FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
> FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
> FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
Why not make these 3 lines above that prepend to FILESEXTRAPATHS consistent?
>
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend
2020-09-17 16:44 ` [meta-arm] " Denys Dmytriyenko
@ 2020-09-18 8:24 ` Nathan Dunne
0 siblings, 0 replies; 5+ messages in thread
From: Nathan Dunne @ 2020-09-18 8:24 UTC (permalink / raw)
To: meta-arm
[-- Attachment #1: Type: text/plain, Size: 2096 bytes --]
On Thu, Sep 17, 2020 at 09:44 AM, Denys Dmytriyenko wrote:
>
> On Thu, Sep 17, 2020 at 09:58:17AM +0000, Nathan Dunne wrote:
>
>> Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent
>> it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files
>>
>> Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
>> Issue-Id: SCM-1302
>> Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
>> ---
>> meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
>> b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
>> index bf57242..5fc3723 100644
>> --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
>> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
>> @@ -1,7 +1,7 @@
>> # Machine specific u-boot
>>
>> -THISDIR := "${THISDIR}"
>> -FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
>> +THIS_DIR := "${THISDIR}"
>> +FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
>> FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
>> FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
>
>
> Why not make these 3 lines above that prepend to FILESEXTRAPATHS
> consistent?
Only the line with ${BP} needs the user defined THIS_DIR because it can't use immediate expansion due to ${BP} containing ${PV}, which is only set after parsing. This is not a problem for the other two lines, hence no need to make use of the ${THIS_DIR} intermediate variable. ${BP} is only being added to FILESEXTRAPATHS because meta-arm master currently needs to support u-boot from oe-core master and dunfell, so once we can drop support for multiple versions there will be less modifications to make if the other two lines aren't touched
The problem is the intermediate variable previously being named "THISDIR", as it should not be manually set and causes subsequent u-boot bbappend files using ${THISDIR} to reference this file's directory instead of their own.
[-- Attachment #2: Type: text/html, Size: 2164 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-arm] [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend
2020-09-17 9:58 [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend Nathan.Dunne
2020-09-17 10:05 ` Diego Sueiro
2020-09-17 16:44 ` [meta-arm] " Denys Dmytriyenko
@ 2020-09-21 16:38 ` Jon Mason
2 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2020-09-21 16:38 UTC (permalink / raw)
To: Nathan Dunne; +Cc: meta-arm, nd
On Thu, Sep 17, 2020 at 09:58:17AM +0000, Nathan Dunne wrote:
> Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent
> it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files
>
> Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
> Issue-Id: SCM-1302
> Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
Pushed to master.
Thanks,
Jon
> ---
> meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> index bf57242..5fc3723 100644
> --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
> @@ -1,7 +1,7 @@
> # Machine specific u-boot
>
> -THISDIR := "${THISDIR}"
> -FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
> +THIS_DIR := "${THISDIR}"
> +FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
> FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
> FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
>
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-21 16:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-17 9:58 [PATCH] arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend Nathan.Dunne
2020-09-17 10:05 ` Diego Sueiro
2020-09-17 16:44 ` [meta-arm] " Denys Dmytriyenko
2020-09-18 8:24 ` Nathan Dunne
2020-09-21 16:38 ` [meta-arm] " Jon Mason
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.