Re: [PATCH v5 6/9] optee-os-stm32mp15x: Do not use shell environment

[Jan Kiszka <jan.kiszka@siemens.com>]

On 22.02.22 13:29, Uladzimir Bely wrote:
> In the email from Tuesday, 22 February 2022 09:49:38 +03 user Jan Kiszka 
> wrote:
>> On 13.02.22 08:41, Uladzimir Bely wrote:
>>> Move export of TEE_IMPL_VERSION variable directly to debian/rules.
>>>
>>> This makes building process more Debian-like.
>>>
>>> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
>>> ---
>>>
>>>  meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb | 5 ++++-
>>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
>>> b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb index
>>> 0fa2005d..9c0efaf1 100644
>>> --- a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
>>> +++ b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
>>> @@ -21,5 +21,8 @@ OPTEE_BINARIES = "tee-header_v2.stm32
>>> tee-pageable_v2.stm32 tee-pager_v2.stm32"> 
>>>  # Set version manually to PV, the tarball does not contain any hint.
>>>  # Alternative: pull from git and add git as build dependency.
>>>  dpkg_runbuild_prepend() {
>>>
>>> -    export TEE_IMPL_VERSION=${PV}
>>> +    cat << EOF >> ${S}/debian/rules
>>> +
>>> +export TEE_IMPL_VERSION=${PV}
>>> +EOF
>>>
>>>  }
>>
>> I think I commented on this anti-pattern elsewhere already: This can
>> lead to piled-up extra lines in the target file. Now that it's merged,
>> please fix up on top, e.g. using a sed rule that avoids duplicate
>> patching or appending to the unpack step.
>>
>> Please also check if you used it elsewhere in fix those spots accordingly.
>>
>> Jan
> 
> I tried to see the problem with line duplicates you are talking about and I 
> couldn't reproduce it. Any way to invalidate do_build (recipe modification, 
> manual task invalidation by bitbake, etc) makes ${S} to be renewed, so "old" 
> lines are not presented here. So, this kind of export appears only once.
> 

Generally, such artifacts come from unpack or patch, and every
stand-along call of do_dpkg_build can cause such aggregation. But you
are right, in this case the debian folder is copied in from clean
source, and we do not see an aggregation. But we may see it if the
underlying include once changes and uses a different way to feed in debian/.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux