Skip to contentSkip to conversation

arm/classes: Ensure patch files are sorted in apply_local_src_patches

PATCH In review Peter Hoyes 1 participant 2 messages Jan 10, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm/classes: Ensure patch files are sorted in apply_local_src_patches

From: Peter Hoyes <[email protected]>

apply_local_src_patches.bbclass was added in a previous patch to handle the application of patch files located inside the fetched source code.

find is used to collect the patch files which does not guarantee the order of its output. Pipe the output of find into sort to ensure patch files are applied in the correct order.

Issue-Id: SCM-5864

Change-Id I1082fb7a726a7745289a5aa8bb6447bef57a94b0
---
 meta-arm/classes/apply_local_src_patches.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/classes/apply_local_src_patches.bbclass +1 -1
index daa85f4c..e1939353 100644
@@ -32,7 +32,7 @@ apply_local_src_patches() {
     export QUILT_PATCHES=./patches-extra
     mkdir -p patches-extra
 
-    for patch in $(find $input_dir -type f -name *.patch -or -name *.diff)
+    for patch in $(find $input_dir -type f -name *.patch -or -name *.diff | sort)
     do
         patch_basename=`basename $patch`
         if ! quilt applied $patch_basename >/dev/null ; then
Signature · 1 line
2.34.1
#1 lore raw
Quoted 5 lines · Peter Hoyes

From: Peter Hoyes <[email protected]>

apply_local_src_patches.bbclass was added in a previous patch to handle the application of patch files located inside the fetched source code.

Quoted 7 lines

find is used to collect the patch files which does not guarantee the order of its output. Pipe the output of find into sort to ensure patch files are applied in the correct order.

Issue-Id: SCM-5864

Change-Id I1082fb7a726a7745289a5aa8bb6447bef57a94b0

Please can this patch be backported to langdale.

Thanks, Peter

Quoted 17 lines
---
  meta-arm/classes/apply_local_src_patches.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/classes/apply_local_src_patches.bbclass +1 -1
index daa85f4c..e1939353 100644
@@ -32,7 +32,7 @@ apply_local_src_patches() {
      export QUILT_PATCHES=./patches-extra
      mkdir -p patches-extra
 
-    for patch in $(find $input_dir -type f -name *.patch -or -name *.diff)
+    for patch in $(find $input_dir -type f -name *.patch -or -name *.diff | sort)
      do
          patch_basename=`basename $patch`
          if ! quilt applied $patch_basename >/dev/null ; then