diff mbox series

[meta-ti] conf: omap-a15: Fix parsing when KERNEL_DEVICETREE is not set

Message ID 20221107201830.1203599-1-JPEWhacker@gmail.com
State Under Review
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti] conf: omap-a15: Fix parsing when KERNEL_DEVICETREE is not set | expand

Commit Message

Joshua Watt Nov. 7, 2022, 8:18 p.m. UTC
From: Zachary Booth <zachary.booth@garmin.com>

Correctly handle parsing when KERNEL_DEVICETREE is not set.

Signed-off-by: Zachary Booth <zachary.booth@garmin.com>
Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 conf/machine/include/omap-a15.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Joshua Watt Nov. 7, 2022, 8:22 p.m. UTC | #1
I forgot to include it in the subject, but this is for the "dunfell" branch

On 11/7/22 14:18, Joshua Watt wrote:
> From: Zachary Booth <zachary.booth@garmin.com>
>
> Correctly handle parsing when KERNEL_DEVICETREE is not set.
>
> Signed-off-by: Zachary Booth <zachary.booth@garmin.com>
> Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> ---
>   conf/machine/include/omap-a15.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
> index 02225a4e..4f57e6d1 100644
> --- a/conf/machine/include/omap-a15.inc
> +++ b/conf/machine/include/omap-a15.inc
> @@ -19,7 +19,7 @@ UBOOT_ARCH = "arm"
>   UBOOT_ENTRYPOINT = "0x80008000"
>   UBOOT_LOADADDRESS = "0x80008000"
>   
> -DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}"
> +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"
>   
>   # Generate an extlinux.conf file
>   UBOOT_EXTLINUX = "1"
Ryan Eatmon Nov. 9, 2022, 6:23 p.m. UTC | #2
On 11/7/2022 14:18, Joshua Watt wrote:
> From: Zachary Booth <zachary.booth@garmin.com>
> 
> Correctly handle parsing when KERNEL_DEVICETREE is not set.
> 
> Signed-off-by: Zachary Booth <zachary.booth@garmin.com>
> Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> ---
>   conf/machine/include/omap-a15.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
> index 02225a4e..4f57e6d1 100644
> --- a/conf/machine/include/omap-a15.inc
> +++ b/conf/machine/include/omap-a15.inc
> @@ -19,7 +19,7 @@ UBOOT_ARCH = "arm"
>   UBOOT_ENTRYPOINT = "0x80008000"
>   UBOOT_LOADADDRESS = "0x80008000"
>   
> -DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}"
> +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"

What is the scenario that results in KERNEL_DEVICETREE not being set?  I 
just checked all of the files in meta-ti that include omap-a15.inc and 
they all have the variable set.



>   # Generate an extlinux.conf file
>   UBOOT_EXTLINUX = "1"
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#15332): https://lists.yoctoproject.org/g/meta-ti/message/15332
> Mute This Topic: https://lists.yoctoproject.org/mt/94875941/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Ryan Eatmon Nov. 10, 2022, 1:48 p.m. UTC | #3
On 11/9/2022 1:23 PM, Booth, Zachary wrote:
> On Wed, 2022-11-09 at 12:23 -0600, Ryan Eatmon wrote:
>> CAUTION - EXTERNAL EMAIL: Do not click any links or open any attachments unless you trust the sender and know the content is safe.
>>
>>
>> On 11/7/2022 14:18, Joshua Watt wrote:
>>> From: Zachary Booth <zachary.booth@garmin.com>
>>>
>>> Correctly handle parsing when KERNEL_DEVICETREE is not set.
>>>
>>> Signed-off-by: Zachary Booth <zachary.booth@garmin.com>
>>> Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
>>> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
>>> ---
>>>    conf/machine/include/omap-a15.inc | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
>>> index 02225a4e..4f57e6d1 100644
>>> --- a/conf/machine/include/omap-a15.inc
>>> +++ b/conf/machine/include/omap-a15.inc
>>> @@ -19,7 +19,7 @@ UBOOT_ARCH = "arm"
>>>    UBOOT_ENTRYPOINT = "0x80008000"
>>>    UBOOT_LOADADDRESS = "0x80008000"
>>>
>>> -DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}"
>>> +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"
>>
>> What is the scenario that results in KERNEL_DEVICETREE not being set?  I
>> just checked all of the files in meta-ti that include omap-a15.inc and
>> they all have the variable set.
> 
> We have a custom machine inheriting omap-a15.inc that uses a separate provider for virtual/dtb. The dtb recipe
> is a thin wrapper around devicetree.bbclass and uses a custom variable instead of KERNEL_DEVICETREE.
> 
> This scenario doesn't use DEVICETREE_FILE, but fails parsing during variable expansion with .replace().


Thanks for explaining that.  I'm working through the backlog and will 
disposition this soon.


>>
>>
>>
>>>    # Generate an extlinux.conf file
>>>    UBOOT_EXTLINUX = "1"
>>>
>>>
>>>
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>> Links: You receive all messages sent to this group.
>>> View/Reply Online (#15332):
>>> https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/message/15332__;!!EJc4YC3iFmQ!SdpzhPqTkZXzwPNri5y_Eg83qQTCVgsStIOOUn2B5I073BB1z5daCsySyGG4_N4a7dChqDYuP5zz12ae$
>>> Mute This Topic:
>>> https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/94875941/6551054__;!!EJc4YC3iFmQ!SdpzhPqTkZXzwPNri5y_Eg83qQTCVgsStIOOUn2B5I073BB1z5daCsySyGG4_N4a7dChqDYuP7GfleXS$
>>> Group Owner: meta-ti+owner@lists.yoctoproject.org
>>> Unsubscribe:
>>> https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/unsub__;!!EJc4YC3iFmQ!SdpzhPqTkZXzwPNri5y_Eg83qQTCVgsStIOOUn2B5I073BB1z5daCsySyGG4_N4a7dChqDYuP-QKB7KP$  [r
>>> eatmon@ti.com]
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>
>>
>> --
>> Ryan Eatmon                reatmon@ti.com
>> -----------------------------------------
>> Texas Instruments, Inc.  -  LCPD  -  MGTS
diff mbox series

Patch

diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index 02225a4e..4f57e6d1 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -19,7 +19,7 @@  UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}"
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"
 
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"