[PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

[PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

['Sai Sree Kartheek Adivi' via isar-users]

Prepend the missing colon to the appended string to ensure 'supp-user'
is registered as a distinct override.

This ensures that SRC_URI:supp-user takes effect when
TEE_SUPPLICANT_IN_USERLAND is to "1".

Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model variations")
Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
---
 .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
index 94399374..f1015028 100644
--- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
+++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
@@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
 # NOTE: default will eventually be flipped
 TEE_SUPPLICANT_IN_USERLAND ?= "1"
 
-OVERRIDES .= "${@'supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
+OVERRIDES .= "${@':supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
 
 SRC_URI:supp-user += "file://local-top"
 
-- 
2.34.1

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20251126092443.3298987-1-s-adivi%40ti.com.

[PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

['Sai Sree Kartheek Adivi' via isar-users]

Prepend the missing colon to the appended string to ensure 'supp-user'
is registered as a distinct override.

This ensures that SRC_URI:supp-user takes effect when
TEE_SUPPLICANT_IN_USERLAND is to "1".

Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model variations")
Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
---
 .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
index 94399374..f1015028 100644
--- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
+++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
@@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
 # NOTE: default will eventually be flipped
 TEE_SUPPLICANT_IN_USERLAND ?= "1"
 
-OVERRIDES .= "${@'supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
+OVERRIDES .= "${@':supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
 
 SRC_URI:supp-user += "file://local-top"
 
-- 
2.34.1

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20251126112816.3415995-1-s-adivi%40ti.com.

Re: [PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

['Jan Kiszka' via isar-users]

On 26.11.25 12:28, Sai Sree Kartheek Adivi wrote:
> Prepend the missing colon to the appended string to ensure 'supp-user'
> is registered as a distinct override.
> 
> This ensures that SRC_URI:supp-user takes effect when
> TEE_SUPPLICANT_IN_USERLAND is to "1".
> 
> Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model variations")
> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
> ---
>  .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> index 94399374..f1015028 100644
> --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> @@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
>  # NOTE: default will eventually be flipped
>  TEE_SUPPLICANT_IN_USERLAND ?= "1"
>  
> -OVERRIDES .= "${@'supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
> +OVERRIDES .= "${@':supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>  
>  SRC_URI:supp-user += "file://local-top"
>  

Thanks, good catch!

Jan

PS: We can temporarily carry that fix in isar-cip-core if upstream isar
should take longer to merge.

-- 
Siemens AG, Foundational Technologies
Linux Expert Center

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/9d4edebd-2075-47b8-9e0c-9070502e3a03%40siemens.com.

Re: [PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

[Zhihang Wei]

Hi, CI is running for this, we plan to merge this tomorrow.

Zhihang

On 11/27/25 08:15, 'Jan Kiszka' via isar-users wrote:
> On 26.11.25 12:28, Sai Sree Kartheek Adivi wrote:
>> Prepend the missing colon to the appended string to ensure 'supp-user'
>> is registered as a distinct override.
>>
>> This ensures that SRC_URI:supp-user takes effect when
>> TEE_SUPPLICANT_IN_USERLAND is to "1".
>>
>> Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model variations")
>> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
>> ---
>>   .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
>> index 94399374..f1015028 100644
>> --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
>> +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
>> @@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
>>   # NOTE: default will eventually be flipped
>>   TEE_SUPPLICANT_IN_USERLAND ?= "1"
>>   
>> -OVERRIDES .= "${@'supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>> +OVERRIDES .= "${@':supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>>   
>>   SRC_URI:supp-user += "file://local-top"
>>   
> Thanks, good catch!
>
> Jan
>
> PS: We can temporarily carry that fix in isar-cip-core if upstream isar
> should take longer to merge.
>

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/fcf97e7b-bb02-4cbc-aa83-1a73b1a1e587%40ilbers.de.

Re: [PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

['Jan Kiszka' via isar-users]

On 27.11.25 09:45, Zhihang Wei wrote:
> Hi, CI is running for this, we plan to merge this tomorrow.
> 

Great, thanks a lot!

Jan

> Zhihang
> 
> On 11/27/25 08:15, 'Jan Kiszka' via isar-users wrote:
>> On 26.11.25 12:28, Sai Sree Kartheek Adivi wrote:
>>> Prepend the missing colon to the appended string to ensure 'supp-user'
>>> is registered as a distinct override.
>>>
>>> This ensures that SRC_URI:supp-user takes effect when
>>> TEE_SUPPLICANT_IN_USERLAND is to "1".
>>>
>>> Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model
>>> variations")
>>> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
>>> ---
>>>   .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/
>>> initramfs-tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-
>>> tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
>>> index 94399374..f1015028 100644
>>> --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-
>>> ftpm-hook_0.3.bb
>>> +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-
>>> ftpm-hook_0.3.bb
>>> @@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
>>>   # NOTE: default will eventually be flipped
>>>   TEE_SUPPLICANT_IN_USERLAND ?= "1"
>>>   -OVERRIDES .= "${@'supp-user' if
>>> bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>>> +OVERRIDES .= "${@':supp-user' if
>>> bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>>>     SRC_URI:supp-user += "file://local-top"
>>>   
>> Thanks, good catch!
>>
>> Jan
>>
>> PS: We can temporarily carry that fix in isar-cip-core if upstream isar
>> should take longer to merge.
>>
> 


-- 
Siemens AG, Foundational Technologies
Linux Expert Center

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/2eeb5205-9bb7-4c38-a3df-deb834df43ea%40siemens.com.

Re: [PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

[Zhihang Wei]

Hi,
Actually CI failed with this fix. I think we have another bug that we 
didn't notice before.

The following test case in fast CI failed:
- citest.py:CrossTest.test_cross

It failed when trying to build target:
- mc:stm32mp15x-bullseye:isar-image-base

Error log follows:
builder@6782040fd604:/work/testsuite$ avocado run 
citest.py:CrossTest.test_cross$
JOB ID : d69c8438384becc97bbdbf1d7c84d6409cf5bc5d
JOB LOG : 
/tmp/tmpv12knspa/avocado/job-results/job-2025-11-27T16.27-d69c843/job.log
(1/1) citest.py:CrossTest.test_cross: STARTED
ERROR: mc:stm32mp15x-bullseye:initramfs-tee-ftpm-hook-0.3-r0 
do_transform_template: Error executing a python function in 
exec_func_python() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_func_python() autogenerated', lineno: 2, function: <module>
0001:
*** 0002:do_transform_template(d)
0003:
File: '/work/meta/classes/template.bbclass', lineno: 53, function: 
do_transform_template
0049: else (template_file + ".out"))
0050: bb.note("{} {} [in: {} out: {}]".format(cmd, args,
0051: template_file, output_file))
0052: with contextlib.ExitStack() as stack:
*** 0053: input = stack.enter_context(open(template_file, 'rb'))
0054: output = stack.enter_context(open(output_file, 'wb'))
0055: process = stack.enter_context(subprocess.Popen([cmd, args], 
stdin=input,
0056: stdout=output, env=env))
0057: if process.wait() != 0:
Exception: FileNotFoundError: [Errno 2] No such file or directory: 
'/work/build/tmp/work/debian-bullseye-armhf/initramfs-tee-ftpm-hook/0.3-r0/hook-header.tmpl'

ERROR: Logfile of failure stored in: 
/work/build/tmp/work/debian-bullseye-armhf/initramfs-tee-ftpm-hook/0.3-r0/temp/log.do_transform_template.66542
(1/1) citest.py:CrossTest.test_cross: FAIL: Bitbake failed (145.59 s)
RESULTS : PASS 0 | ERROR 0 | FAIL 1 | SKIP 0 | WARN 0 | INTERRUPT 0 | 
CANCEL 0
JOB TIME : 146.95 s

Test summary:
citest.py:CrossTest.test_cross: FAIL



You can redo the test on your machine using avocado:
1. Have a clean clone of isar, checkout to branch next and apply your 
patches:
$ git clone -b next https://github.com/ilbers/isar.git
$ cd isar
$ git am /path-to/0001-my-contribution-to-isar.patch
2. Disable several unrelated targets to make error appears faster, by 
applying
the following diff:

diff --git a/testsuite/citest.py b/testsuite/citest.py
index 2e46088d..ed6a1114 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -197,14 +197,7 @@ class CrossTest(CIBaseTest):

      def test_cross(self):
          targets = [
-            'mc:qemuarm-buster:isar-image-ci',
-            'mc:qemuarm-bullseye:isar-image-ci',
-            'mc:de0-nano-soc-bullseye:isar-image-base',
              'mc:stm32mp15x-bullseye:isar-image-base',
-            'mc:qemuarm-bookworm:isar-image-ci',
-            'mc:qemuarm64-focal:isar-image-base',
-            'mc:nanopi-neo-efi-bookworm:isar-image-base',
-            'mc:phyboard-mira-bookworm:isar-image-base',
          ]

          self.init()


3.Run kas shell, setup CI prerequisites (avocado, qemu) and cleanup:
$ ./kas/kas-container shell kas/isar.yaml --command \
     "rm -rf /work/build/conf && /work/scripts/ci_setup.sh"
4.Run the failed test in fast:
$ cd /work/testsuite
$avocado run citest.py:CrossTest.test_cross$

Best regards,
Zhihang

On 11/26/25 12:28, 'Sai Sree Kartheek Adivi' via isar-users wrote:
> Prepend the missing colon to the appended string to ensure 'supp-user'
> is registered as a distinct override.
>
> This ensures that SRC_URI:supp-user takes effect when
> TEE_SUPPLICANT_IN_USERLAND is to "1".
>
> Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model variations")
> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
> ---
>   .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> index 94399374..f1015028 100644
> --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> @@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
>   # NOTE: default will eventually be flipped
>   TEE_SUPPLICANT_IN_USERLAND ?= "1"
>   
> -OVERRIDES .= "${@'supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
> +OVERRIDES .= "${@':supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>   
>   SRC_URI:supp-user += "file://local-top"
>   

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/c0eb516f-42d0-451c-9040-e293025a92ee%40ilbers.de.

Re: [PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

['Jan Kiszka' via isar-users]

On 27.11.25 17:18, Zhihang Wei wrote:
> Hi,
> Actually CI failed with this fix. I think we have another bug that we
> didn't notice before.
> 

Yes,

SRC_URI:supp-user += "file://local-top"

effectively means

SRC_URI:supp-user = "file://local-top"

and that breaks the initramfs-hook infrastructure. Should have been
:append, but that line was wrong anyway. Let me send out my other patch
then so that you can safely apply this one on top.

Jan

> The following test case in fast CI failed:
> - citest.py:CrossTest.test_cross
> 
> It failed when trying to build target:
> - mc:stm32mp15x-bullseye:isar-image-base
> 
> Error log follows:
> builder@6782040fd604:/work/testsuite$ avocado run
> citest.py:CrossTest.test_cross$
> JOB ID : d69c8438384becc97bbdbf1d7c84d6409cf5bc5d
> JOB LOG : /tmp/tmpv12knspa/avocado/job-results/job-2025-11-27T16.27-
> d69c843/job.log
> (1/1) citest.py:CrossTest.test_cross: STARTED
> ERROR: mc:stm32mp15x-bullseye:initramfs-tee-ftpm-hook-0.3-r0
> do_transform_template: Error executing a python function in
> exec_func_python() autogenerated:
> 
> The stack trace of python calls that resulted in this exception/failure
> was:
> File: 'exec_func_python() autogenerated', lineno: 2, function: <module>
> 0001:
> *** 0002:do_transform_template(d)
> 0003:
> File: '/work/meta/classes/template.bbclass', lineno: 53, function:
> do_transform_template
> 0049: else (template_file + ".out"))
> 0050: bb.note("{} {} [in: {} out: {}]".format(cmd, args,
> 0051: template_file, output_file))
> 0052: with contextlib.ExitStack() as stack:
> *** 0053: input = stack.enter_context(open(template_file, 'rb'))
> 0054: output = stack.enter_context(open(output_file, 'wb'))
> 0055: process = stack.enter_context(subprocess.Popen([cmd, args],
> stdin=input,
> 0056: stdout=output, env=env))
> 0057: if process.wait() != 0:
> Exception: FileNotFoundError: [Errno 2] No such file or directory: '/
> work/build/tmp/work/debian-bullseye-armhf/initramfs-tee-ftpm-hook/0.3-
> r0/hook-header.tmpl'
> 
> ERROR: Logfile of failure stored in: /work/build/tmp/work/debian-
> bullseye-armhf/initramfs-tee-ftpm-hook/0.3-r0/temp/
> log.do_transform_template.66542
> (1/1) citest.py:CrossTest.test_cross: FAIL: Bitbake failed (145.59 s)
> RESULTS : PASS 0 | ERROR 0 | FAIL 1 | SKIP 0 | WARN 0 | INTERRUPT 0 |
> CANCEL 0
> JOB TIME : 146.95 s
> 
> Test summary:
> citest.py:CrossTest.test_cross: FAIL
> 
> 
> 
> You can redo the test on your machine using avocado:
> 1. Have a clean clone of isar, checkout to branch next and apply your
> patches:
> $ git clone -b next https://github.com/ilbers/isar.git
> $ cd isar
> $ git am /path-to/0001-my-contribution-to-isar.patch
> 2. Disable several unrelated targets to make error appears faster, by
> applying
> the following diff:
> 
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index 2e46088d..ed6a1114 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -197,14 +197,7 @@ class CrossTest(CIBaseTest):
> 
>      def test_cross(self):
>          targets = [
> -            'mc:qemuarm-buster:isar-image-ci',
> -            'mc:qemuarm-bullseye:isar-image-ci',
> -            'mc:de0-nano-soc-bullseye:isar-image-base',
>              'mc:stm32mp15x-bullseye:isar-image-base',
> -            'mc:qemuarm-bookworm:isar-image-ci',
> -            'mc:qemuarm64-focal:isar-image-base',
> -            'mc:nanopi-neo-efi-bookworm:isar-image-base',
> -            'mc:phyboard-mira-bookworm:isar-image-base',
>          ]
> 
>          self.init()
> 
> 
> 3.Run kas shell, setup CI prerequisites (avocado, qemu) and cleanup:
> $ ./kas/kas-container shell kas/isar.yaml --command \
>     "rm -rf /work/build/conf && /work/scripts/ci_setup.sh"
> 4.Run the failed test in fast:
> $ cd /work/testsuite
> $avocado run citest.py:CrossTest.test_cross$
> 
> Best regards,
> Zhihang
> 
> On 11/26/25 12:28, 'Sai Sree Kartheek Adivi' via isar-users wrote:
>> Prepend the missing colon to the appended string to ensure 'supp-user'
>> is registered as a distinct override.
>>
>> This ensures that SRC_URI:supp-user takes effect when
>> TEE_SUPPLICANT_IN_USERLAND is to "1".
>>
>> Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model
>> variations")
>> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
>> ---
>>   .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-
>> tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/
>> initramfs-tee-ftpm-hook_0.3.bb
>> index 94399374..f1015028 100644
>> --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-
>> ftpm-hook_0.3.bb
>> +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-
>> ftpm-hook_0.3.bb
>> @@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
>>   # NOTE: default will eventually be flipped
>>   TEE_SUPPLICANT_IN_USERLAND ?= "1"
>>   -OVERRIDES .= "${@'supp-user' if
>> bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>> +OVERRIDES .= "${@':supp-user' if
>> bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>>     SRC_URI:supp-user += "file://local-top"
>>   
> 


-- 
Siemens AG, Foundational Technologies
Linux Expert Center

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/2e5400ea-5ec4-414d-b4c3-d0696766c711%40siemens.com.

Re: [PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

[Zhihang Wei]

On 11/27/25 17:47, Jan Kiszka wrote:
> On 27.11.25 17:18, Zhihang Wei wrote:
>> Hi,
>> Actually CI failed with this fix. I think we have another bug that we
>> didn't notice before.
>>
> Yes,
>
> SRC_URI:supp-user += "file://local-top"
>
> effectively means
>
> SRC_URI:supp-user = "file://local-top"
>
> and that breaks the initramfs-hook infrastructure. Should have been
> :append, but that line was wrong anyway. Let me send out my other patch
> then so that you can safely apply this one on top.
>
> Jan
CI has passed for this patch together with [PATCH] 
initramfs-tee-ftpm-hook: Restore waiting for tpm device. We'll merge 
both by the end of this workday if there's no more discussion coming.

Zhihang
>> The following test case in fast CI failed:
>> - citest.py:CrossTest.test_cross
>>
>> It failed when trying to build target:
>> - mc:stm32mp15x-bullseye:isar-image-base
>>
>> Error log follows:
>> builder@6782040fd604:/work/testsuite$ avocado run
>> citest.py:CrossTest.test_cross$
>> JOB ID : d69c8438384becc97bbdbf1d7c84d6409cf5bc5d
>> JOB LOG : /tmp/tmpv12knspa/avocado/job-results/job-2025-11-27T16.27-
>> d69c843/job.log
>> (1/1) citest.py:CrossTest.test_cross: STARTED
>> ERROR: mc:stm32mp15x-bullseye:initramfs-tee-ftpm-hook-0.3-r0
>> do_transform_template: Error executing a python function in
>> exec_func_python() autogenerated:
>>
>> The stack trace of python calls that resulted in this exception/failure
>> was:
>> File: 'exec_func_python() autogenerated', lineno: 2, function: <module>
>> 0001:
>> *** 0002:do_transform_template(d)
>> 0003:
>> File: '/work/meta/classes/template.bbclass', lineno: 53, function:
>> do_transform_template
>> 0049: else (template_file + ".out"))
>> 0050: bb.note("{} {} [in: {} out: {}]".format(cmd, args,
>> 0051: template_file, output_file))
>> 0052: with contextlib.ExitStack() as stack:
>> *** 0053: input = stack.enter_context(open(template_file, 'rb'))
>> 0054: output = stack.enter_context(open(output_file, 'wb'))
>> 0055: process = stack.enter_context(subprocess.Popen([cmd, args],
>> stdin=input,
>> 0056: stdout=output, env=env))
>> 0057: if process.wait() != 0:
>> Exception: FileNotFoundError: [Errno 2] No such file or directory: '/
>> work/build/tmp/work/debian-bullseye-armhf/initramfs-tee-ftpm-hook/0.3-
>> r0/hook-header.tmpl'
>>
>> ERROR: Logfile of failure stored in: /work/build/tmp/work/debian-
>> bullseye-armhf/initramfs-tee-ftpm-hook/0.3-r0/temp/
>> log.do_transform_template.66542
>> (1/1) citest.py:CrossTest.test_cross: FAIL: Bitbake failed (145.59 s)
>> RESULTS : PASS 0 | ERROR 0 | FAIL 1 | SKIP 0 | WARN 0 | INTERRUPT 0 |
>> CANCEL 0
>> JOB TIME : 146.95 s
>>
>> Test summary:
>> citest.py:CrossTest.test_cross: FAIL
>>
>>
>>
>> You can redo the test on your machine using avocado:
>> 1. Have a clean clone of isar, checkout to branch next and apply your
>> patches:
>> $ git clone -b next https://github.com/ilbers/isar.git
>> $ cd isar
>> $ git am /path-to/0001-my-contribution-to-isar.patch
>> 2. Disable several unrelated targets to make error appears faster, by
>> applying
>> the following diff:
>>
>> diff --git a/testsuite/citest.py b/testsuite/citest.py
>> index 2e46088d..ed6a1114 100755
>> --- a/testsuite/citest.py
>> +++ b/testsuite/citest.py
>> @@ -197,14 +197,7 @@ class CrossTest(CIBaseTest):
>>
>>       def test_cross(self):
>>           targets = [
>> -            'mc:qemuarm-buster:isar-image-ci',
>> -            'mc:qemuarm-bullseye:isar-image-ci',
>> -            'mc:de0-nano-soc-bullseye:isar-image-base',
>>               'mc:stm32mp15x-bullseye:isar-image-base',
>> -            'mc:qemuarm-bookworm:isar-image-ci',
>> -            'mc:qemuarm64-focal:isar-image-base',
>> -            'mc:nanopi-neo-efi-bookworm:isar-image-base',
>> -            'mc:phyboard-mira-bookworm:isar-image-base',
>>           ]
>>
>>           self.init()
>>
>>
>> 3.Run kas shell, setup CI prerequisites (avocado, qemu) and cleanup:
>> $ ./kas/kas-container shell kas/isar.yaml --command \
>>      "rm -rf /work/build/conf && /work/scripts/ci_setup.sh"
>> 4.Run the failed test in fast:
>> $ cd /work/testsuite
>> $avocado run citest.py:CrossTest.test_cross$
>>
>> Best regards,
>> Zhihang
>>
>> On 11/26/25 12:28, 'Sai Sree Kartheek Adivi' via isar-users wrote:
>>> Prepend the missing colon to the appended string to ensure 'supp-user'
>>> is registered as a distinct override.
>>>
>>> This ensures that SRC_URI:supp-user takes effect when
>>> TEE_SUPPLICANT_IN_USERLAND is to "1".
>>>
>>> Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model
>>> variations")
>>> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
>>> ---
>>>    .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-
>>> tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/
>>> initramfs-tee-ftpm-hook_0.3.bb
>>> index 94399374..f1015028 100644
>>> --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-
>>> ftpm-hook_0.3.bb
>>> +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-
>>> ftpm-hook_0.3.bb
>>> @@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
>>>    # NOTE: default will eventually be flipped
>>>    TEE_SUPPLICANT_IN_USERLAND ?= "1"
>>>    -OVERRIDES .= "${@'supp-user' if
>>> bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>>> +OVERRIDES .= "${@':supp-user' if
>>> bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>>>      SRC_URI:supp-user += "file://local-top"
>>>    
>

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/e79db2c8-79ce-48d2-b875-5bb0ef14d7f5%40ilbers.de.

Re: [PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

[Zhihang Wei]

Applied to next, thanks.

Zhihang

On 11/26/25 12:28, 'Sai Sree Kartheek Adivi' via isar-users wrote:
> Prepend the missing colon to the appended string to ensure 'supp-user'
> is registered as a distinct override.
>
> This ensures that SRC_URI:supp-user takes effect when
> TEE_SUPPLICANT_IN_USERLAND is to "1".
>
> Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model variations")
> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
> ---
>   .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> index 94399374..f1015028 100644
> --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> @@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
>   # NOTE: default will eventually be flipped
>   TEE_SUPPLICANT_IN_USERLAND ?= "1"
>   
> -OVERRIDES .= "${@'supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
> +OVERRIDES .= "${@':supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>   
>   SRC_URI:supp-user += "file://local-top"
>   

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/07635d0d-7ecc-4aab-afb0-8c20ef553e37%40ilbers.de.

Re: [PATCH] initramfs-tee-ftpm-hook: Fix missing separator in OVERRIDES append

[Zhihang Wei]

Applied to next, thanks.

Zhihang

On 11/26/25 12:28, 'Sai Sree Kartheek Adivi' via isar-users wrote:
> Prepend the missing colon to the appended string to ensure 'supp-user'
> is registered as a distinct override.
>
> This ensures that SRC_URI:supp-user takes effect when
> TEE_SUPPLICANT_IN_USERLAND is to "1".
>
> Fixes: 3896e4da ("initramfs-tee-ftpm-hook: Use override to model variations")
> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
> ---
>   .../initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb      | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> index 94399374..f1015028 100644
> --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/initramfs-tee-ftpm-hook_0.3.bb
> @@ -12,7 +12,7 @@ require recipes-initramfs/initramfs-hook/hook.inc
>   # NOTE: default will eventually be flipped
>   TEE_SUPPLICANT_IN_USERLAND ?= "1"
>   
> -OVERRIDES .= "${@'supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
> +OVERRIDES .= "${@':supp-user' if bb.utils.to_boolean(d.getVar('TEE_SUPPLICANT_IN_USERLAND')) else ''}"
>   
>   SRC_URI:supp-user += "file://local-top"
>   

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/753961e0-e2f6-4081-a5e8-4cbc89439a68%40ilbers.de.