[PATCH] cml1.bbclass: Return sorted list of cfg files

[PATCH] cml1.bbclass: Return sorted list of cfg files

[Khem Raj]

Since these files are passed to merge_config.sh its better to use a
sorted list, so we can be sure that this list is always fed in same
order irrespective of python versions on host

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/cml1.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index d319d66ab2..1c3d70b48d 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -6,7 +6,7 @@ def find_cfgs(d):
         if s.endswith('.cfg'):
             sources_list.append(s)
 
-    return sources_list
+    return sorted(sources_list)
 
 cml1_do_configure() {
 	set -e
-- 
2.31.1

Re: [OE-core] [PATCH] cml1.bbclass: Return sorted list of cfg files

[Konrad Weihmann]

On 03.05.21 08:36, Khem Raj wrote:
> Since these files are passed to merge_config.sh its better to use a
> sorted list, so we can be sure that this list is always fed in same
> order irrespective of python versions on host
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   meta/classes/cml1.bbclass | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
> index d319d66ab2..1c3d70b48d 100644
> --- a/meta/classes/cml1.bbclass
> +++ b/meta/classes/cml1.bbclass
> @@ -6,7 +6,7 @@ def find_cfgs(d):
>           if s.endswith('.cfg'):
>               sources_list.append(s)
>   
> -    return sources_list
> +    return sorted(sources_list)

Just as a thought, wouldn't it be better to have the ordering defined 
based on recipe/layer meta data?

Previously ordering was more or less based on the inode number of the 
files - now it's alphabetically.

I know that config fragments should be self containing, but seen enough 
real world examples where that isn't the case, so for them this might 
cause a breaking change (tbf the behavior before wasn't fully 
deterministic as well)

But this issue isn't limited to this particular piece of code here and 
might need some more general solution.

>   
>   cml1_do_configure() {
>   	set -e
> 
> 
> 
> 
> 

Re: [OE-core] [PATCH] cml1.bbclass: Return sorted list of cfg files

[Denys Dmytriyenko]

On Mon, May 03, 2021 at 08:57:02AM +0200, Konrad Weihmann wrote:
> On 03.05.21 08:36, Khem Raj wrote:
> >Since these files are passed to merge_config.sh its better to use a
> >sorted list, so we can be sure that this list is always fed in same
> >order irrespective of python versions on host
> >
> >Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >---
> >  meta/classes/cml1.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
> >index d319d66ab2..1c3d70b48d 100644
> >--- a/meta/classes/cml1.bbclass
> >+++ b/meta/classes/cml1.bbclass
> >@@ -6,7 +6,7 @@ def find_cfgs(d):
> >          if s.endswith('.cfg'):
> >              sources_list.append(s)
> >-    return sources_list
> >+    return sorted(sources_list)
> 
> Just as a thought, wouldn't it be better to have the ordering
> defined based on recipe/layer meta data?
> 
> Previously ordering was more or less based on the inode number of
> the files - now it's alphabetically.
> 
> I know that config fragments should be self containing, but seen
> enough real world examples where that isn't the case, so for them
> this might cause a breaking change (tbf the behavior before wasn't
> fully deterministic as well)

Correct, config fragments can come from different places and it's quite 
common for latter fragments to amend some former fragments in the list. 
So, sorting them either way would sure enhance determinism, but surely 
break a lot of existing functionality out there...


> But this issue isn't limited to this particular piece of code here
> and might need some more general solution.
> 
> >  cml1_do_configure() {
> >  	set -e
> >

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964