[PATCH] package: always sort the conffiles

[PATCH] package: always sort the conffiles

[Jean-Marie Lemetayer]

To improve package reproducibility, the conffiles order should not be
directly linked to the file system.

Sorting the conffiles solves this issue.
---
 meta/lib/oe/package.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 70040f09e7..9d70925b9b 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -613,7 +613,7 @@ def get_conffiles(pkg, d):
         conf_list[i] = conf_list[i][1:]
 
     os.chdir(cwd)
-    return conf_list
+    return sorted(conf_list)
 
 def legitimize_package_name(s):
     """
-- 
2.34.1

Re: [OE-core] [PATCH] package: always sort the conffiles

[Alexandre Belloni]

Hello,

On 27/07/2023 17:37:32+0200, Jean-Marie Lemetayer via lists.openembedded.org wrote:
> To improve package reproducibility, the conffiles order should not be
> directly linked to the file system.
> 
> Sorting the conffiles solves this issue.


This is missing you Signed-off-by tag.

> ---
>  meta/lib/oe/package.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
> index 70040f09e7..9d70925b9b 100644
> --- a/meta/lib/oe/package.py
> +++ b/meta/lib/oe/package.py
> @@ -613,7 +613,7 @@ def get_conffiles(pkg, d):
>          conf_list[i] = conf_list[i][1:]
>  
>      os.chdir(cwd)
> -    return conf_list
> +    return sorted(conf_list)
>  
>  def legitimize_package_name(s):
>      """
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184964): https://lists.openembedded.org/g/openembedded-core/message/184964
> Mute This Topic: https://lists.openembedded.org/mt/100392906/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[PATCH v2] package: always sort the conffiles

[Jean-Marie Lemetayer]

To improve package reproducibility, the conffiles order should not be
directly linked to the file system.

Sorting the conffiles solves this issue.

Signed-off-by: Jean-Marie Lemetayer <j.lemetayer@kerlink.fr>
---
 meta/lib/oe/package.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 70040f09e7..9d70925b9b 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -613,7 +613,7 @@ def get_conffiles(pkg, d):
         conf_list[i] = conf_list[i][1:]
 
     os.chdir(cwd)
-    return conf_list
+    return sorted(conf_list)
 
 def legitimize_package_name(s):
     """
-- 
2.34.1

[PATCH v2] package: always sort the conffiles

[Jean-Marie Lemetayer]

To improve package reproducibility, the conffiles order should not be
directly linked to the file system.

Sorting the conffiles solves this issue.

Signed-off-by: Jean-Marie Lemetayer <j.lemetayer@kerlink.fr>
---
 meta/lib/oe/package.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 70040f09e7..9d70925b9b 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -613,7 +613,7 @@ def get_conffiles(pkg, d):
         conf_list[i] = conf_list[i][1:]
 
     os.chdir(cwd)
-    return conf_list
+    return sorted(conf_list)
 
 def legitimize_package_name(s):
     """
-- 
2.34.1

[PATCH v2] package: always sort the conffiles

[Jean-Marie Lemetayer]

To improve package reproducibility, the conffiles order should not be
directly linked to the file system.

Sorting the conffiles solves this issue.

Signed-off-by: Jean-Marie Lemetayer <j.lemetayer@kerlink.fr>
---
 meta/lib/oe/package.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 70040f09e7..9d70925b9b 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -613,7 +613,7 @@ def get_conffiles(pkg, d):
         conf_list[i] = conf_list[i][1:]
 
     os.chdir(cwd)
-    return conf_list
+    return sorted(conf_list)
 
 def legitimize_package_name(s):
     """
-- 
2.34.1